Forráskód Böngészése

* Don't truncate log's timestamp when relaying logs

Bryan Drewery 16 éve
szülő
commit
2c73e786fa
3 módosított fájl, 4 hozzáadás és 4 törlés
  1. 2 2
      src/botmsg.c
  2. 1 1
      src/log.c
  3. 1 1
      src/tandem.h

+ 2 - 2
src/botmsg.c

@@ -317,11 +317,11 @@ void putbot(const char *bot, char *par)
 	 - sends to uplink if a leaf
 	 - sends to all linked hubs if a hub
 */
-void botnet_send_log(int idx, const char *from, int type, const char *msg)
+void botnet_send_log(int idx, const char *from, int type, const char *msg, bool truncate_ts)
 {
   size_t len;
   // Cut out timestamp
-  if (conf.bot->hub)
+  if (truncate_ts)
     len = simple_snprintf(OBUF, sizeof(OBUF), "lo %s %d %s\n", from, type, &msg[LOG_TS_LEN]);
   else
     len = simple_snprintf(OBUF, sizeof(OBUF), "lo %s %d %s\n", from, type, msg);

+ 1 - 1
src/log.c

@@ -314,7 +314,7 @@ void putlog(int type, const char *chname, const char *format, ...)
 #endif
   /* broadcast to hubs */
   if (chname[0] == '*' && conf.bot && conf.bot->nick)
-    botnet_send_log(-1, conf.bot->nick, type, out);
+    botnet_send_log(-1, conf.bot->nick, type, out, (conf.bot->hub ? 1 : 0));
 
   for (idx = 0; idx < dcc_total; idx++) {
     if (dcc[idx].type && (dcc[idx].type == &DCC_CHAT && dcc[idx].simul == -1) && (dcc[idx].u.chat->con_flags & type)) {

+ 1 - 1
src/tandem.h

@@ -61,7 +61,7 @@ void botnet_send_link(int, char *, char *, char *);
 void botnet_send_update(int, tand_t *);
 void botnet_send_nlinked(int, char *, char *, char, int, time_t, char *, char *);
 void botnet_send_reject(int, char *, char *, char *, char *, char *);
-void botnet_send_log(int, const char *, int, const char *);
+void botnet_send_log(int, const char *, int, const char *, bool = 0);
 void botnet_send_zapf(int, const char *, const char *, const char *);
 void botnet_send_zapf_broad(int, const char *, const char *, const char *);
 void botnet_send_away(int, char *, int, char *, int);