Silence logging in non-debug usecases. The raspii users gonna love this.

[citadel.git] / citadel / modules / network / serv_network.c

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 79f06a60a004512bc41bafdf9ee464fadeefd748..ab9dbd66605381c563ee9bec21c32788d681a479 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -194,11 +194,14 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One
        struct RoomProcList *ptr;
 
        ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
-       if (ptr == NULL) return NULL;
+       if (ptr == NULL) {
+               return NULL;
+       }
 
        ptr->namelen = strlen(qrbuf->QRname);
-       if (ptr->namelen > ROOMNAMELEN)
+       if (ptr->namelen > ROOMNAMELEN) {
                ptr->namelen = ROOMNAMELEN - 1;
+       }
 
        memcpy (ptr->name, qrbuf->QRname, ptr->namelen);
        ptr->name[ptr->namelen] = '\0';
@@ -211,8 +214,6 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One
 
        ptr->lcname[ptr->namelen] = '\0';
        ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345);
-       ptr->lastsent = OneRNCFG->lastsent;
-       ptr->OneRNCfg = OneRNCFG;
        return ptr;
 }
 
@@ -265,7 +266,6 @@ int network_room_handler(struct ctdlroom *qrbuf)
                return 1;
        }
 
-       ptr->OneRNCfg = NULL;
        begin_critical_section(S_RPLIST);
        ptr->next = rplist;
        rplist = ptr;
@@ -319,8 +319,8 @@ void network_do_queue(void)
        if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") )
        {
                full_processing = 0;
-               syslog(LOG_DEBUG, "Network full processing in %ld seconds.",
-                      CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
+               MARK_syslog(LOG_DEBUG, "Network full processing in %ld seconds.",
+                           CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
                );
        }
 
@@ -369,10 +369,7 @@ void network_do_queue(void)
                        }
 
                        if (ptr->namelen > 0) {
-                               InspectQueuedRoom(&sc,
-                                                 ptr, 
-                                                 working_ignetcfg,
-                                                 the_netmap);
+                               InspectQueuedRoom(&sc, ptr, working_ignetcfg, the_netmap);
                        }
                        ptr = ptr->next;
                }
@@ -411,7 +408,7 @@ void network_do_queue(void)
                free(pMapStr);
        }
 
-       /* combine singe message files into one spool entry per remote node. */
+       /* combine single message files into one spool entry per remote node. */
        network_consolidate_spoolout(working_ignetcfg, the_netmap);
 
        /* shut down. */
@@ -426,8 +423,6 @@ void network_do_queue(void)
                last_run = time(NULL);
        }
        destroy_network_queue_room(RL.rplist);
-       // SaveChangedConfigs();        // FIXME FOOFOO SAVE CHANGED THIS AACACACACCKK
-
 }