CHANSERV: fix issue where chanserv_relay doesn't wait for db to be loaded before...

[irc/quakenet/newserv.git] / serverlist / serverlist.c

diff --git a/serverlist/serverlist.c b/serverlist/serverlist.c
index 8e040f482b92ca1ec97f5ebd8ad978535ee33f86..f4de5cf5d17560615f38949f202f8cea714e54f9 100644 (file)
--- a/serverlist/serverlist.c
+++ b/serverlist/serverlist.c
@@ -1,5 +1,3 @@
-/* Some utterly useless dog */
-
 #include "../core/schedule.h"
 #include "../irc/irc.h"
 #include "../lib/irc_string.h"
@@ -39,7 +37,6 @@ const flag servertypeflags[] = {
 
 struct {
   int used;
-  time_t ts;
   int lag;
   sstring *version1;
   sstring *version2;
@@ -87,7 +84,6 @@ void _init(void) {
     else
       serverinfo[i].used = 0;
 
-    serverinfo[i].ts = getnettime();
     serverinfo[i].lag = -1;
     serverinfo[i].version1 = NULL;
     serverinfo[i].version2 = NULL;
@@ -130,7 +126,7 @@ int cmd_serverlist(void *sender, int cargc, char **cargv) {
   char lagstr[20];
   char buf[512];
 
-  controlreply(np, "%-7s %-30s %5s/%5s/%-5s %-7s %-7s %-20s %-8s %-20s", "Numeric", "Hostname", "ECl", "Cl", "MaxCl", "Flags", "Type", "Connected for", "Lag", "Version");
+  controlreply(np, "%-7s %-35s %5s/%5s/%-7s %-7s %-7s %-20s %-8s %-20s", "Numeric", "Hostname", "ECl", "Cl", "MaxCl", "Flags", "Type", "Connected for", "Lag", "Version");
 
   scount = acount = 0;
 
@@ -152,10 +148,10 @@ int cmd_serverlist(void *sender, int cargc, char **cargv) {
 
       strlcpy(buf, printflags(serverinfo[i].type, servertypeflags), sizeof(buf));
 
-      controlreply(np, "%-7d %-30s %5d/%5d/%-5d %-7s %-7s %-20s %-8s %-20s - %s", i, serverlist[i].name->content,
+      controlreply(np, "%-7d %-35s %5d/%5d/%-7d %-7s %-7s %-20s %-8s %-20s - %s", i, serverlist[i].name->content,
             servercount[i], ucount, serverlist[i].maxusernum,
             printflags(serverlist[i].flags, smodeflags), buf,
-            longtoduration(getnettime() - serverinfo[i].ts, 0),
+            longtoduration(getnettime() - serverlist[i].ts, 0),
             lagstr,
             serverinfo[i].version1 ? serverinfo[i].version1->content : "Unknown",
             serverinfo[i].version2 ? serverinfo[i].version2->content : "Unknown");
@@ -212,7 +208,6 @@ void serverlist_hook_newserver(int hook, void *arg) {
   long num = (long)arg;
 
   serverinfo[num].used = 1;
-  serverinfo[num].ts = getnettime();
   serverinfo[num].version1 = NULL;
   serverinfo[num].version2 = NULL;
   serverinfo[num].type = getservertype(&serverlist[num]);