From 67b8133646681885f82336ffcbc7ee4805ae8341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eckl=2C=20M=C3=A1t=C3=A9?= <ecklm94@gmail.com>
Date: Thu, 26 May 2016 14:15:13 +0200
Subject: [PATCH] =?UTF-8?q?Sort=C3=B6r=C3=A9s=20log=20v=C3=A9g=C3=A9n=20eg?=
=?UTF-8?q?ys=C3=A9ges=C3=ADtve=20(#5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mostantól minden log üzenetet a végén sortörés nélkül kell írni, majd a logoló függvény eldönti, hogy kell-e tenni a végére.
---
include/logger.h | 2 +-
main.cpp | 10 +++++-----
src/dns_db.cpp | 4 ++--
src/dns_server.cpp | 4 ++--
src/logger.cpp | 3 +++
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/include/logger.h b/include/logger.h
index 911d368..1f0bf4a 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -11,7 +11,7 @@
#include <syslog.h>
#define LOGGER_FUNCTION_HEADER(func_name) void (func_name)(int __pri, const char *__fmt, ...)
-#define PERROR_ON_DEMAND(__s) log_on_demand(LOG_ERR, "%s: %s\n", __s, strerror(errno))
+#define PERROR_ON_DEMAND(__s) log_on_demand(LOG_ERR, "%s: %s", __s, strerror(errno))
typedef LOGGER_FUNCTION_HEADER(*logger);
diff --git a/main.cpp b/main.cpp
index 1ce55c1..3507a2a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
log_on_demand = stdlog_on_demand;
IPC_US_communicator sl(COMM_SOCK_PATH, false);
sl.send_data("shutdown");
- log_on_demand(LOG_INFO, "Answer received: %s\n", sl.recv_data().c_str());
+ log_on_demand(LOG_INFO, "Answer received: %s", sl.recv_data().c_str());
exit(EXIT_SUCCESS);
}
else
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- log_on_demand(LOG_INFO, "Server started on pid %d\n", getpid()); // Enélkül nem hajlandó sudo után logolni.
+ log_on_demand(LOG_INFO, "Server started on pid %d", getpid()); // Enélkül nem hajlandó sudo után logolni.
IPC_US_communicator comm_link(COMM_SOCK_PATH, run_as_daemon);
struct passwd *new_uid = getpwnam("dnsuser");
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
PERROR_ON_DEMAND("chroot");
exit(EXIT_SUCCESS);
}
- log_on_demand(LOG_INFO, "Chrooted to \"%s\"\n", WORKING_DIR);
+ log_on_demand(LOG_INFO, "Chrooted to \"%s\"", WORKING_DIR);
if(chdir("/") < 0)
{
PERROR_ON_DEMAND("chdir");
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
}
catch(db_exception ex)
{
- log_on_demand(LOG_ERR, "%s\n", ex.what());
+ log_on_demand(LOG_ERR, ex.what());
exit(EXIT_FAILURE);
}
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
{
static char addr[INET6_ADDRSTRLEN];
inet_ntop(server_address.sin6_family, &server_address.sin6_addr, addr, INET6_ADDRSTRLEN);
- log_on_demand(LOG_DEBUG, "Server started serving on: %s\n",addr);
+ log_on_demand(LOG_DEBUG, "Server started serving on: %s",addr);
}
// ----------------- INIT END --------------------------
diff --git a/src/dns_db.cpp b/src/dns_db.cpp
index 36e032f..9610d4d 100644
--- a/src/dns_db.cpp
+++ b/src/dns_db.cpp
@@ -92,9 +92,9 @@ static int callback(void *param, int argc, char **argv, char **azColName) {
ret->ttl = atoi(argv[3]);
if(verbose)
{
- log_on_demand(LOG_DEBUG, "Database hit:\n");
+ log_on_demand(LOG_DEBUG, "Database hit:");
for(int i=0;i<argc;i++)
- log_on_demand(LOG_DEBUG, "%s = %s\n", azColName[i], argv[i]);
+ log_on_demand(LOG_DEBUG, "%s = %s", azColName[i], argv[i]);
}
return 0;
}
diff --git a/src/dns_server.cpp b/src/dns_server.cpp
index e78e838..52bfdc0 100644
--- a/src/dns_server.cpp
+++ b/src/dns_server.cpp
@@ -57,7 +57,7 @@ void dns_server::serve_one_request() {
{
static char buf[INET6_ADDRSTRLEN];
dns_label_sequence_to_str(query.question_body.get_name(), buf, INET6_ADDRSTRLEN);
- log_on_demand(LOG_DEBUG, "DNS query received from %s\n", buf);
+ log_on_demand(LOG_DEBUG, "DNS query received from %s", buf);
}
//dns response
@@ -78,7 +78,7 @@ void dns_server::serve_one_request() {
}
catch(db_exception ex)
{
- log_on_demand(LOG_ERR, "%s\n", ex.what());
+ log_on_demand(LOG_ERR, ex.what());
}
//---
diff --git a/src/logger.cpp b/src/logger.cpp
index 63866cb..d76ff28 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,6 +1,7 @@
#include "../include/logger.h"
#include <stdarg.h>
#include <stdio.h>
+#include <stdio.h>
LOGGER_FUNCTION_HEADER(syslog_on_demand) {
va_list args;
@@ -17,9 +18,11 @@ LOGGER_FUNCTION_HEADER(stdlog_on_demand) {
case LOG_INFO:
case LOG_DEBUG:
vprintf(__fmt, args);
+ printf("\n");
break;
default:
vfprintf(stderr, __fmt, args);
+ printf("\n");
}
va_end(args);
}
\ No newline at end of file
--
GitLab