X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fscripts%2Fmk_module_init.sh;h=ade4e96986fcdaa56253eda7f0b00e008a4770c5;hb=0c9cb3fbc797de34635bc6748937b710a4d37bcb;hp=84de37702308221f280304ac64bfaee2c2f3990a;hpb=e750a47a92b48dfa6faf63a61a71f103871c9e5b;p=citadel.git

diff --git a/citadel/scripts/mk_module_init.sh b/citadel/scripts/mk_module_init.sh
index 84de37702..ade4e9698 100755
--- a/citadel/scripts/mk_module_init.sh
+++ b/citadel/scripts/mk_module_init.sh
@@ -30,7 +30,7 @@ U_FILE="$CUR_DIR/modules_upgrade.c"
 
 /usr/bin/printf "Scanning extension modules for entry points.\n"
 
-STATIC_FIRST_MODULES="citserver control modules euidindex msgbase nttlist database internet_addressing"
+STATIC_FIRST_MODULES="control modules euidindex msgbase nttlist database"
 DYNAMIC_MODULES=`grep CTDL_MODULE_INIT modules/*/*.c |$SED 's;.*(\(.*\));\1;'`
 if test -d user_modules; then 
     USER_MODULES=`grep CTDL_MODULE_INIT user_modules/*/*.c |$SED 's;.*(\(.*\));\1;'`
@@ -73,12 +73,7 @@ void initialise_modules (int threading)
     long filter;
     const char *pMod;
 
-    if (threading) {
-        MODM_syslog(LOG_DEBUG, "Initializing, CtdlThreads enabled.\n");
-    }
-    else {
-        MODM_syslog(LOG_INFO, "Initializing. CtdlThreads not yet enabled.\n");
-    }
+    syslog(LOG_DEBUG, "modules: initializing, CtdlThreads %s", (threading ? "enabled" : "not yet enabled"));
 
 EOF
 
@@ -86,7 +81,7 @@ EOF
 for i in ${STATIC_FIRST_MODULES} ${DYNAMIC_MODULES} ${USER_MODULES} ${STATIC_LAST_MODULES}; do 
 cat <<EOF >> $C_FILE
 	pMod = CTDL_INIT_CALL($i);
-	MOD_syslog(LOG_DEBUG, "Loaded module: %s\n", pMod);
+	syslog(LOG_DEBUG, "modules: loaded %s", pMod);
 EOF
 
 done
@@ -208,13 +203,13 @@ void upgrade_modules (void)
 {
         const char *pMod;
 
-        MODM_syslog(LOG_INFO, "Upgrade modules.\n");
+        syslog(LOG_INFO, "modules: upgrading.");
 
 EOF
 
 # Add this entry point to the .c file
 
-grep CTDL_MODULE_UPGRADE *.c modules/*/*.c  |$SED 's;.*(\(.*\));\tpMod = CTDL_UPGRADE_CALL(\1)\;\n\tMOD_syslog(LOG_INFO, "%s\\n", pMod)\;\n;' >> $U_FILE
+grep CTDL_MODULE_UPGRADE *.c modules/*/*.c  |$SED 's;.*(\(.*\));\tpMod = CTDL_UPGRADE_CALL(\1)\;\n\tsyslog(LOG_INFO, "modules: %s\\n", pMod)\;\n;' >> $U_FILE
 
 #close the upgrade file
 /usr/bin/printf "}\n" >> $U_FILE