more moving to new logging standard

[citadel.git] / citadel / scripts / mk_module_init.sh

diff --git a/citadel/scripts/mk_module_init.sh b/citadel/scripts/mk_module_init.sh
index 3ed51024c54c832a5bc47c95c8e36c07ac77c3b7..ade4e96986fcdaa56253eda7f0b00e008a4770c5 100755 (executable)
--- 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 file_ops msgbase room_ops user_ops nttlist"
+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
@@ -129,6 +124,8 @@ cat <<EOF >> $H_FILE
 EOF
 done
 
+grep CTDL_MODULE_UPGRADE *.c modules/*/*.c  |$SED 's;.*(\(.*\));\CTDL_MODULE_UPGRADE(\1)\;\n;' >> $H_FILE
+
 cat <<EOF >> $H_FILE
 
 
@@ -150,7 +147,7 @@ cat <<EOF  >$MOD_FILE
 SERV_MODULES = \\
 EOF
 
-echo modules/*/*.c | $SED "s;\.c ;.o \\\\\n;g" >> $MOD_FILE
+echo modules/*/*.c | $SED -e "s;\.c ;.o \\\\\n;g" -e "s;\.c;.o;" >> $MOD_FILE
 echo >> $MOD_FILE
 
 
@@ -170,7 +167,6 @@ cat <<EOF  >$SRC_FILE
 SOURCES = \\
 EOF
 
-
 echo modules/*/*.c | $SED "s;\.c ;.c \\\\\n;g" >> $SRC_FILE
 echo >> $SRC_FILE
 
@@ -207,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