* Use syslog-compatible logging levels in lprintf(); the loglevel chosen

[citadel.git] / citadel / serv_upgrade.c

diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index 8a8c49213d7523d64bae2fa4de7c65c8d57dfe52..47396e1b825353a0cf5846a40b2b43d81ad3f787 100644 (file)
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -72,14 +72,14 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
        while (rplist != NULL) {
 
                if (lgetroom(&qr, rplist->name) == 0) {
-                       lprintf(9, "Processing <%s>...\n", rplist->name);
+                       lprintf(CTDL_DEBUG, "Processing <%s>...\n", rplist->name);
                        if ( (qr.QRflags & QR_MAILBOX) == 0) {
-                               lprintf(9, "  -- not a mailbox\n");
+                               lprintf(CTDL_DEBUG, "  -- not a mailbox\n");
                        }
                        else {
 
                                qr.QRgen = time(NULL);
-                               lprintf(9, "  -- fixed!\n");
+                               lprintf(CTDL_DEBUG, "  -- fixed!\n");
                        }
                        lputroom(&qr);
                }
@@ -94,7 +94,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
  * quick fix to bump mailbox generation numbers
  */
 void bump_mailbox_generation_numbers(void) {
-       lprintf(5, "Applying security fix to mailbox rooms\n");
+       lprintf(CTDL_WARNING, "Applying security fix to mailbox rooms\n");
        ForEachRoom(cmd_bmbx_backend, NULL);
        cmd_bmbx_backend(NULL, NULL);
        return;
@@ -127,7 +127,7 @@ void cbtm_backend(struct ctdluser *usbuf, void *data) {
        while (uplist != NULL) {
 
                if (lgetuser(&us, uplist->user) == 0) {
-                       lprintf(9, "Processing <%s>...\n", uplist->user);
+                       lprintf(CTDL_DEBUG, "Processing <%s>...\n", uplist->user);
                        if (us.uid == BBSUID) {
                                us.uid = (-1);
                        }
@@ -144,7 +144,7 @@ void cbtm_backend(struct ctdluser *usbuf, void *data) {
  * quick fix to change all BBSUID users to (-1)
  */
 void convert_bbsuid_to_minusone(void) {
-       lprintf(5, "Applying uid changes\n");
+       lprintf(CTDL_WARNING, "Applying uid changes\n");
        ForEachUser(cbtm_backend, NULL);
        cbtm_backend(NULL, NULL);
        return;
@@ -177,13 +177,14 @@ void update_config(void) {
 void check_server_upgrades(void) {
 
        get_control();
-       lprintf(5, "Server-hosted upgrade level is %d.%02d\n",
+       lprintf(CTDL_INFO, "Server-hosted upgrade level is %d.%02d\n",
                (CitControl.version / 100),
                (CitControl.version % 100) );
 
        if (CitControl.version < REV_LEVEL) {
-               lprintf(5, "Server hosted updates need to be processed at "
-                               "this time.  Please wait...\n");
+               lprintf(CTDL_WARNING,
+                       "Server hosted updates need to be processed at "
+                       "this time.  Please wait...\n");
        }
        else {
                return;
@@ -192,7 +193,8 @@ void check_server_upgrades(void) {
        update_config();
 
        if ((CitControl.version > 000) && (CitControl.version < 555)) {
-               lprintf(1, "Your data files are from a version of Citadel\n"
+               lprintf(CTDL_EMERG,
+                       "Your data files are from a version of Citadel\n"
                        "that is too old to be upgraded.  Sorry.\n");
                exit(EXIT_FAILURE);
        }