Simplify logging to STDOUT and avoid writing logs to STDOUT twice

m-kress · m-kress · commit 2de5a3b4dde3 · 2020-01-13T09:01:30.000+01:00
diff --git a/src/metalog.c b/src/metalog.c
@@ -1306,15 +1306,6 @@ static int log_line(LogLineType loglinetype, char *buf)
     return processLogLine(logcode, prg, info);
 }
 
-static int log_udp(char *buf, int bsize)
-{
-    buf[bsize] = '\0';
-    if (write(1, buf, strlen(buf)) != (ssize_t) strlen(buf))
-        return -1;
-
-    return log_line(LOGLINETYPE_SYSLOG, buf);
-}
-
 static int log_kernel(char *buf, int bsize)
 {
     char *s = buf;
@@ -1404,7 +1395,9 @@ static int process(const int sockets[])
                 ;
             if (rd == -1)
                 return -1;
-            log_udp(buffer[0], rd);
+
+            buffer[0][rd] = '\0';
+            log_line(LOGLINETYPE_SYSLOG, buffer[0]);
         }
 
         /* STREAM_SOCKET (klog) */

Original file line number	Diff line number	Diff line change
`@@ -1306,15 +1306,6 @@ static int log_line(LogLineType loglinetype, char *buf)`
`1306`	`1306`	`return processLogLine(logcode, prg, info);`
`1307`	`1307`	`}`
`1308`	`1308`
`1309`		`-static int log_udp(char *buf, int bsize)`
`1310`		`-{`
`1311`		`- buf[bsize] = '\0';`
`1312`		`- if (write(1, buf, strlen(buf)) != (ssize_t) strlen(buf))`
`1313`		`- return -1;`
`1314`		`-`
`1315`		`- return log_line(LOGLINETYPE_SYSLOG, buf);`
`1316`		`-}`
`1317`		`-`
`1318`	`1309`	`static int log_kernel(char *buf, int bsize)`
`1319`	`1310`	`{`
`1320`	`1311`	`char *s = buf;`
`@@ -1404,7 +1395,9 @@ static int process(const int sockets[])`
`1404`	`1395`	`;`
`1405`	`1396`	`if (rd == -1)`
`1406`	`1397`	`return -1;`
`1407`		`- log_udp(buffer[0], rd);`
	`1398`	`+`
	`1399`	`+ buffer[0][rd] = '\0';`
	`1400`	`+ log_line(LOGLINETYPE_SYSLOG, buffer[0]);`
`1408`	`1401`	`}`
`1409`	`1402`
`1410`	`1403`	`/* STREAM_SOCKET (klog) */`