fix: logger

This commit is contained in:
Tobias Reisinger 2020-04-24 15:08:26 +02:00
commit db3bcaf7d1
28 changed files with 201 additions and 181 deletions

View file

@ -3,27 +3,17 @@ project(controller)
add_executable(controller main.c) add_executable(controller main.c)
option(WIRING_PI_DEBUG "Use WiringPi Debugging Tool (0=off, 1=silent, 2=LOG_DEBUG) (0)" OFF) option(WIRING_PI_DEBUG "Use WiringPi Debugging Tool (0)" OFF)
option(LOG_LEVEL "Set logging level (5=trace, 4=debug, 3=info, 2=warn, 1=error, 0=fatal) (3)" OFF)
SET(CMAKE_C_FLAGS "-Wall -Wextra -Werror -Wpedantic -lwiringPi -lwiringPiDev -luuid -llmdb -g") SET(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wextra -Werror -Wpedantic -lwiringPi -lwiringPiDev -luuid -llmdb -g")
string(LENGTH "${CMAKE_SOURCE_DIR}/" SOURCE_PATH_SIZE) string(LENGTH "${CMAKE_SOURCE_DIR}/" SOURCE_PATH_SIZE)
add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}") add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}")
if(WIRING_PI_DEBUG) if(WIRING_PI_DEBUG)
if(WIRING_PI_DEBUG GREATER 1)
message("Showing wiringPi calls as debug") message("Showing wiringPi calls as debug")
else(WIRING_PI_DEBUG GREATER 1) add_definitions("-DWIRING_PI_DEBUG")
message("Ignoring wiringPi calls")
endif(WIRING_PI_DEBUG GREATER 1)
add_definitions("-DWIRING_PI_DEBUG=${WIRING_PI_DEBUG}")
endif(WIRING_PI_DEBUG) endif(WIRING_PI_DEBUG)
if(LOG_LEVEL)
add_definitions("-DLOG_LEVEL=${LOG_LEVEL}")
else(LOG_LEVEL)
add_definitions("-DLOG_LEVEL=3")
endif(LOG_LEVEL)
aux_source_directory(vendor VENDOR_SRC) # vendor first to put their warnings on top aux_source_directory(vendor VENDOR_SRC) # vendor first to put their warnings on top
aux_source_directory(. SRC_DIR) aux_source_directory(. SRC_DIR)

View file

@ -2,7 +2,8 @@
name = new emgauwa device name = new emgauwa device
discovery-port = 4421 discovery-port = 4421
relay-count = 10 relay-count = 10
database = db.lmdb database = controller_db.lmdb
log-level = debug
[relay-0] [relay-0]
driver = piface driver = piface

View file

@ -64,7 +64,7 @@ handler_command(int fd, controller_t *controller)
if((client_fd = accept(fd, (struct sockaddr *) &their_addr, &addr_size)) < 0) if((client_fd = accept(fd, (struct sockaddr *) &their_addr, &addr_size)) < 0)
{ {
LOG_ERROR("could not accept client: %s", strerror(errno)); LOG_ERROR("could not accept client: %s\n", strerror(errno));
return; return;
} }
@ -72,7 +72,7 @@ handler_command(int fd, controller_t *controller)
if(recv(client_fd, &payload_length, sizeof(payload_length), 0) <= 0) if(recv(client_fd, &payload_length, sizeof(payload_length), 0) <= 0)
{ {
LOG_ERROR("unable to receive header: %s", strerror(errno)); LOG_ERROR("unable to receive header: %s\n", strerror(errno));
return; return;
} }
@ -81,7 +81,7 @@ handler_command(int fd, controller_t *controller)
if((bytes_transferred = recv(client_fd, payload, payload_length, 0)) <= 0) if((bytes_transferred = recv(client_fd, payload, payload_length, 0)) <= 0)
{ {
LOG_ERROR("unable to receive payload: %s", strerror(errno)); LOG_ERROR("unable to receive payload: %s\n", strerror(errno));
return; return;
} }
@ -92,7 +92,7 @@ handler_command(int fd, controller_t *controller)
uint8_t command_code = mpack_node_u8(mpack_node_map_uint(root, COMMAND_MAPPING_CODE)); uint8_t command_code = mpack_node_u8(mpack_node_map_uint(root, COMMAND_MAPPING_CODE));
LOG_INFO("received command %d", command_code); LOG_INFO("received command %d\n", command_code);
switch(command_code) switch(command_code)
{ {
@ -116,12 +116,12 @@ handler_command(int fd, controller_t *controller)
case COMMAND_CODE_GET_RELAY_NAME: case COMMAND_CODE_GET_RELAY_NAME:
break; break;
default: default:
LOG_ERROR("received invalid command"); LOG_ERROR("received invalid command\n");
} }
if(mpack_tree_destroy(&tree) != mpack_ok) if(mpack_tree_destroy(&tree) != mpack_ok)
{ {
LOG_WARN("error when destroying mpack tree"); LOG_WARN("error when destroying mpack tree\n");
} }
free(payload); free(payload);
close(client_fd); close(client_fd);

View file

@ -26,14 +26,14 @@ handler_discovery(int fd, controller_t *controller)
if((bytes_transferred = recvfrom(fd, &discovery_answer_port, sizeof(discovery_answer_port), 0, (struct sockaddr *) &si_other, &slen)) <= 0) if((bytes_transferred = recvfrom(fd, &discovery_answer_port, sizeof(discovery_answer_port), 0, (struct sockaddr *) &si_other, &slen)) <= 0)
{ {
LOG_ERROR("received invalid discovery from %s", inet_ntoa(si_other.sin_addr)); LOG_ERROR("received invalid discovery from %s\n", inet_ntoa(si_other.sin_addr));
return; return;
} }
LOG_INFO("received discovery from %s:%d", inet_ntoa(si_other.sin_addr), discovery_answer_port); LOG_INFO("received discovery from %s:%d\n", inet_ntoa(si_other.sin_addr), discovery_answer_port);
if(discovery_answer_port == 0) if(discovery_answer_port == 0)
{ {
LOG_ERROR("invalid port received"); LOG_ERROR("invalid port received\n");
return; return;
} }
@ -56,7 +56,7 @@ handler_discovery(int fd, controller_t *controller)
// finish writing // finish writing
if(mpack_writer_destroy(&writer) != mpack_ok) if(mpack_writer_destroy(&writer) != mpack_ok)
{ {
LOG_ERROR("error writing discovery answer payload"); LOG_ERROR("error writing discovery answer payload\n");
return; return;
} }
@ -64,21 +64,21 @@ handler_discovery(int fd, controller_t *controller)
int fd_answer = helper_connect_tcp_server(inet_ntoa(si_other.sin_addr), discovery_answer_port); int fd_answer = helper_connect_tcp_server(inet_ntoa(si_other.sin_addr), discovery_answer_port);
if(fd_answer == -1) if(fd_answer == -1)
{ {
LOG_ERROR("error during connecting"); LOG_ERROR("error during connecting\n");
free(payload); free(payload);
return; return;
} }
if((bytes_transferred = send(fd_answer, &payload_size, sizeof(payload_size), 0)) <= 0) if((bytes_transferred = send(fd_answer, &payload_size, sizeof(payload_size), 0)) <= 0)
{ {
LOG_ERROR("error during sending"); LOG_ERROR("error during sending\n");
free(payload); free(payload);
close(fd_answer); close(fd_answer);
return; return;
} }
if((bytes_transferred = send(fd_answer, payload, payload_size, 0)) <= 0) if((bytes_transferred = send(fd_answer, payload, payload_size, 0)) <= 0)
{ {
LOG_ERROR("error during sending"); LOG_ERROR("error during sending\n");
free(payload); free(payload);
close(fd_answer); close(fd_answer);
return; return;

View file

@ -15,14 +15,14 @@
void void
handler_loop(controller_t *controller) handler_loop(controller_t *controller)
{ {
LOG_DEBUG("===== IDLE LOOP START ====="); LOG_DEBUG("===== IDLE LOOP START =====\n");
for(uint_fast8_t i = 0; i < controller->relay_count; ++i) for(uint_fast8_t i = 0; i < controller->relay_count; ++i)
{ {
relay_t *relay = controller->relays[i]; relay_t *relay = controller->relays[i];
int is_active = 0; int is_active = 0;
if(relay_is_active(relay, time(NULL))) if(relay_is_active(relay, time(NULL)))
{ {
LOG_DEBUG("relay %d is active", i); LOG_DEBUG("relay %d is active\n", i);
is_active = 1; is_active = 1;
} }
if(global_config.relay_configs[i].inverted) if(global_config.relay_configs[i].inverted)
@ -38,7 +38,7 @@ handler_loop(controller_t *controller)
driver_piface_set(global_config.relay_configs[i].pin, is_active); driver_piface_set(global_config.relay_configs[i].pin, is_active);
break; break;
default: default:
LOG_WARN("relay %d is not using a driver", i); LOG_WARN("relay %d is not using a driver\n", i);
} }
} }
} }

View file

@ -29,7 +29,7 @@ handler_poll(struct pollfd *fds, controller_t *controller, MDB_env *mdb_env)
if(fds[i].revents & POLLIN) if(fds[i].revents & POLLIN)
{ {
/* data may be read on device number i. */ /* data may be read on device number i. */
LOG_DEBUG("fd %i may read data", fds[i].fd); LOG_DEBUG("fd %i may read data\n", fds[i].fd);
switch(i) switch(i)
{ {
case POLL_FDS_DISCOVERY: case POLL_FDS_DISCOVERY:
@ -44,7 +44,7 @@ handler_poll(struct pollfd *fds, controller_t *controller, MDB_env *mdb_env)
if(fds[i].revents & POLLHUP) if(fds[i].revents & POLLHUP)
{ {
/* A hangup has occurred on device number i. */ /* A hangup has occurred on device number i. */
LOG_DEBUG("fd %i got closed", fds[i].fd); LOG_DEBUG("fd %i got closed\n", fds[i].fd);
} }
} }
} }

View file

@ -3,6 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <netdb.h> #include <netdb.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h>
#include <errno.h> #include <errno.h>
#include <logger.h> #include <logger.h>
@ -25,7 +26,7 @@ helper_bind_tcp_server(char* addr, uint16_t port, int max_client_backlog)
if ((status = getaddrinfo(addr, port_str, &hints, &res)) != 0) if ((status = getaddrinfo(addr, port_str, &hints, &res)) != 0)
{ {
LOG_ERROR("getaddrinfo: %s", gai_strerror(status)); LOG_ERROR("getaddrinfo: %s\n", gai_strerror(status));
return -1; return -1;
} }
@ -33,14 +34,14 @@ helper_bind_tcp_server(char* addr, uint16_t port, int max_client_backlog)
if ((status = bind(fd, res->ai_addr, res->ai_addrlen)) == -1) if ((status = bind(fd, res->ai_addr, res->ai_addrlen)) == -1)
{ {
LOG_ERROR("error binding socket: %s", strerror(errno)); LOG_ERROR("error binding socket: %s\n", strerror(errno));
freeaddrinfo(res); freeaddrinfo(res);
return -1; return -1;
} }
if ((status = listen(fd, max_client_backlog)) == -1) if ((status = listen(fd, max_client_backlog)) == -1)
{ {
LOG_ERROR("error setting up listener: %s", strerror(errno)); LOG_ERROR("error setting up listener: %s\n", strerror(errno));
freeaddrinfo(res); freeaddrinfo(res);
return -1; return -1;
} }

View file

@ -28,7 +28,7 @@ helper_connect_tcp_server(char* host, uint16_t port)
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol); //creating Socket s = socket(res->ai_family, res->ai_socktype, res->ai_protocol); //creating Socket
if ((status = connect(s, res->ai_addr, res->ai_addrlen)) != 0) { if ((status = connect(s, res->ai_addr, res->ai_addrlen)) != 0) {
LOG_ERROR("connect() failed"); LOG_ERROR("connect() failed\n");
freeaddrinfo(res); freeaddrinfo(res);
return -1; return -1;
} }

View file

@ -14,7 +14,7 @@ helper_get_port(int sock)
socklen_t len = sizeof(sin); socklen_t len = sizeof(sin);
if (getsockname(sock, (struct sockaddr *)&sin, &len) == -1) if (getsockname(sock, (struct sockaddr *)&sin, &len) == -1)
{ {
LOG_ERROR("could not get socket name for port: %s", strerror(errno)); LOG_ERROR("could not get socket name for port: %s\n", strerror(errno));
return 0; return 0;
} }
else else

View file

@ -30,6 +30,41 @@ helper_load_config(IniDispatch *disp, void *config_void)
strcpy(config->database, disp->value); strcpy(config->database, disp->value);
return 0; return 0;
} }
if(CONFINI_IS_KEY("controller", "log-level"))
{
if(strcasecmp(disp->value, "trace") == 0)
{
config->log_level = LOG_LEVEL_TRACE;
return 0;
}
if(strcasecmp(disp->value, "debug") == 0)
{
config->log_level = LOG_LEVEL_DEBUG;
return 0;
}
if(strcasecmp(disp->value, "info") == 0)
{
config->log_level = LOG_LEVEL_INFO;
return 0;
}
if(strcasecmp(disp->value, "warn") == 0)
{
config->log_level = LOG_LEVEL_WARN;
return 0;
}
if(strcasecmp(disp->value, "error") == 0)
{
config->log_level = LOG_LEVEL_ERROR;
return 0;
}
if(strcasecmp(disp->value, "fatal") == 0)
{
config->log_level = LOG_LEVEL_FATAL;
return 0;
}
LOG_WARN("invalid log-level '%s'\n", disp->value);
return 0;
}
if(CONFINI_IS_KEY("controller", "discovery-port")) if(CONFINI_IS_KEY("controller", "discovery-port"))
{ {
config->discovery_port = atoi(disp->value); config->discovery_port = atoi(disp->value);
@ -43,7 +78,7 @@ helper_load_config(IniDispatch *disp, void *config_void)
{ {
config->relay_configs[i].driver= RELAY_DRIVER_NONE; config->relay_configs[i].driver= RELAY_DRIVER_NONE;
} }
LOG_TRACE("config relay-count set to %u", config->relay_count); LOG_TRACE("config relay-count set to %u\n", config->relay_count);
return 0; return 0;
} }
for(uint8_t i = 0; i < config->relay_count; ++i) for(uint8_t i = 0; i < config->relay_count; ++i)
@ -71,7 +106,7 @@ helper_load_config(IniDispatch *disp, void *config_void)
config->relay_configs[i].driver = RELAY_DRIVER_PIFACE; config->relay_configs[i].driver = RELAY_DRIVER_PIFACE;
return 0; return 0;
} }
LOG_WARN("invalid driver '%s' in section '%s'", disp->value, relay_section_name); LOG_WARN("invalid driver '%s' in section '%s'\n", disp->value, relay_section_name);
return 0; return 0;
} }
} }

View file

@ -25,7 +25,7 @@ helper_open_discovery_socket(uint16_t discovery_port)
//get connection info for our computer //get connection info for our computer
if ((status = getaddrinfo(NULL, discovery_port_str, &hints, &res)) != 0) if ((status = getaddrinfo(NULL, discovery_port_str, &hints, &res)) != 0)
{ {
LOG_FATAL("getaddrinfo: %s", gai_strerror(status)); LOG_FATAL("getaddrinfo: %s\n", gai_strerror(status));
freeaddrinfo(res); freeaddrinfo(res);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -37,21 +37,21 @@ helper_open_discovery_socket(uint16_t discovery_port)
// lose the pesky "Address already in use" error message // lose the pesky "Address already in use" error message
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1) if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1)
{ {
LOG_FATAL("setsockopt: %s", strerror(errno)); LOG_FATAL("setsockopt: %s\n", strerror(errno));
freeaddrinfo(res); freeaddrinfo(res);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (bind(fd, res->ai_addr, res->ai_addrlen) == -1) if (bind(fd, res->ai_addr, res->ai_addrlen) == -1)
{ {
LOG_FATAL("bind: %s", strerror(errno)); LOG_FATAL("bind: %s\n", strerror(errno));
freeaddrinfo(res); freeaddrinfo(res);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
freeaddrinfo(res); freeaddrinfo(res);
LOG_INFO("opened discovery socket on port %u", discovery_port); LOG_INFO("opened discovery socket on port %u\n", discovery_port);
return fd; return fd;
} }

View file

@ -50,12 +50,12 @@ helpers_parse_cli(int argc, const char **argv, config_t *config)
config->run_type = RUN_TYPE_TEST; config->run_type = RUN_TYPE_TEST;
return; return;
} }
LOG_FATAL("bad action '%s' given ('start', 'test')", argv[0]); LOG_FATAL("bad action '%s' given ('start', 'test')\n", argv[0]);
exit(1); exit(1);
} }
else else
{ {
LOG_FATAL("no action given ('start', 'test')"); LOG_FATAL("no action given ('start', 'test')\n");
exit(1); exit(1);
} }
return; return;

View file

@ -17,6 +17,7 @@ typedef struct
{ {
char *file; char *file;
char *database; char *database;
log_level_t log_level;
run_type_t run_type; run_type_t run_type;
char name[MAX_NAME_LENGTH + 1]; char name[MAX_NAME_LENGTH + 1];
uint16_t discovery_port; uint16_t discovery_port;

View file

@ -1,8 +1,6 @@
#ifndef CONTROLLER_CONTANTS_H #ifndef CONTROLLER_CONTANTS_H
#define CONTROLLER_CONTANTS_H #define CONTROLLER_CONTANTS_H
#include <log_levels.h>
#define SECONDS_PER_DAY 86400 // 60 * 60 * 24 #define SECONDS_PER_DAY 86400 // 60 * 60 * 24
#define SECONDS_PER_MINUTE 60 #define SECONDS_PER_MINUTE 60
@ -30,8 +28,4 @@
#define PIFACE_GPIO_BASE 200 #define PIFACE_GPIO_BASE 200
#ifndef LOG_LEVEL
#define LOG_LEVEL LOG_LEVEL_INFO
#endif
#endif /* CONTROLLER_CONTANTS_H */ #endif /* CONTROLLER_CONTANTS_H */

View file

@ -50,4 +50,14 @@ typedef enum
RUN_TYPE_TEST, RUN_TYPE_TEST,
} run_type_t; } run_type_t;
typedef enum
{
LOG_LEVEL_TRACE = 5,
LOG_LEVEL_DEBUG = 4,
LOG_LEVEL_INFO = 3,
LOG_LEVEL_WARN = 2,
LOG_LEVEL_ERROR = 1,
LOG_LEVEL_FATAL = 0,
} log_level_t;
#endif /* CONTROLLER_ENUMS_H */ #endif /* CONTROLLER_ENUMS_H */

View file

@ -1,11 +0,0 @@
#ifndef CONTROLLER_LOG_LEVELS_H
#define CONTROLLER_LOG_LEVELS_H
#define LOG_LEVEL_TRACE 5
#define LOG_LEVEL_DEBUG 4
#define LOG_LEVEL_INFO 3
#define LOG_LEVEL_WARN 2
#define LOG_LEVEL_ERROR 1
#define LOG_LEVEL_FATAL 0
#endif //CONTROLLER_LOG_LEVELS_H

View file

@ -8,55 +8,14 @@
#include <config.h> #include <config.h>
#include <macros.h> #include <macros.h>
#define COLOR_TRACE COLOR_GREEN void
#define COLOR_DEBUG COLOR_BLUE logger_log(FILE *stream, log_level_t level, const char *filename, int line, const char *func, const char *msg, ...);
#define COLOR_INFO COLOR_CYAN
#define COLOR_WARN COLOR_YELLOW
#define COLOR_ERROR COLOR_RED
#define COLOR_FATAL COLOR_MAGENTA
#define _LOGGER_TIMESTAMP_SIZE 32 #define LOG_TRACE(...) logger_log(stdout, LOG_LEVEL_TRACE, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__)
char _LOGGER_TIMESTAMP[_LOGGER_TIMESTAMP_SIZE]; #define LOG_DEBUG(...) logger_log(stdout, LOG_LEVEL_DEBUG, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__)
#define LOG_INFO(...) logger_log(stdout, LOG_LEVEL_INFO , __FILENAME__, __LINE__, __func__, ##__VA_ARGS__)
char* #define LOG_WARN(...) logger_log(stdout, LOG_LEVEL_WARN , __FILENAME__, __LINE__, __func__, ##__VA_ARGS__)
logger_get_timestamp(); #define LOG_ERROR(...) logger_log(stderr, LOG_LEVEL_ERROR, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__)
#define LOG_FATAL(...) logger_log(stderr, LOG_LEVEL_FATAL, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__)
#define _LOGGER_MESSAGE(msg) " %s %s:%d:%s: " COLOR_NONE msg "\n", logger_get_timestamp(), __FILENAME__, __LINE__, __func__
#if LOG_LEVEL >= LOG_LEVEL_TRACE
#define LOG_TRACE(msg, ...) fprintf(stdout, COLOR_TRACE "[TRACE]" _LOGGER_MESSAGE(msg), ##__VA_ARGS__)
#else
#define LOG_TRACE(msg, ...)
#endif
#if LOG_LEVEL >= LOG_LEVEL_DEBUG
#define LOG_DEBUG(msg, ...) fprintf(stdout, COLOR_DEBUG "[DEBUG]" _LOGGER_MESSAGE(msg), ##__VA_ARGS__)
#else
#define LOG_DEBUG(msg, ...)
#endif
#if LOG_LEVEL >= LOG_LEVEL_INFO
#define LOG_INFO(msg, ...) fprintf(stdout, COLOR_INFO "[ INFO]" _LOGGER_MESSAGE(msg), ##__VA_ARGS__)
#else
#define LOG_INFO(msg, ...)
#endif
#if LOG_LEVEL >= LOG_LEVEL_WARN
#define LOG_WARN(msg, ...) fprintf(stdout, COLOR_WARN "[ WARN]" _LOGGER_MESSAGE(msg), ##__VA_ARGS__)
#else
#define LOG_WARN(msg, ...)
#endif
#if LOG_LEVEL >= LOG_LEVEL_ERROR
#define LOG_ERROR(msg, ...) fprintf(stderr, COLOR_ERROR "[ERROR]" _LOGGER_MESSAGE(msg), ##__VA_ARGS__)
#else
#define LOG_ERROR(msg, ...)
#endif
#if LOG_LEVEL >= LOG_LEVEL_FATAL
#define LOG_FATAL(msg, ...) fprintf(stderr, COLOR_FATAL "[FATAL]" _LOGGER_MESSAGE(msg), ##__VA_ARGS__)
#else
#define LOG_FATAL(msg, ...)
#endif
#endif //CONTROLLER_LOGGER_H #endif //CONTROLLER_LOGGER_H

View file

@ -4,18 +4,12 @@
#include <logger.h> #include <logger.h>
#ifdef WIRING_PI_DEBUG #ifdef WIRING_PI_DEBUG
#if WIRING_PI_DEBUG > 1 #define wiringPiSetup() LOG_DEBUG("wiringPi wiringPiSetup()\n")
#define LOG_WIRING_DEBUG(x, ...) LOG_DEBUG(x, ##__VA_ARGS__) #define wiringPiSetupSys() LOG_DEBUG("wiringPi wiringPiSetupSys()\n")
#else #define pinMode(x,y) LOG_DEBUG("wiringPi pinMode(%d, %d)\n", x, y)
#define LOG_WIRING_DEBUG(x, ...) #define digitalWrite(x,y) LOG_DEBUG("wiringPi digitalWrite(%d, %d)\n", x, y)
#endif
#define wiringPiSetup() LOG_WIRING_DEBUG("wiringPi wiringPiSetup()") #define piFaceSetup(x) LOG_DEBUG("wiringPi piFaceSetup(%d)\n", x)
#define wiringPiSetupSys() LOG_WIRING_DEBUG("wiringPi wiringPiSetupSys()")
#define pinMode(x,y) LOG_WIRING_DEBUG("wiringPi pinMode(%d, %d)", x, y)
#define digitalWrite(x,y) LOG_WIRING_DEBUG("wiringPi digitalWrite(%d, %d)", x, y)
#define piFaceSetup(x) LOG_WIRING_DEBUG("wiringPi piFaceSetup(%d)", x)
#endif #endif
#endif /* CONTROLLER_WIRING_DEBUG_H */ #endif /* CONTROLLER_WIRING_DEBUG_H */

View file

@ -1,10 +1,59 @@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <config.h>
#include <logger.h> #include <logger.h>
char* #define COLOR_TRACE COLOR_GREEN
logger_get_timestamp() #define COLOR_DEBUG COLOR_BLUE
#define COLOR_INFO COLOR_CYAN
#define COLOR_WARN COLOR_YELLOW
#define COLOR_ERROR COLOR_RED
#define COLOR_FATAL COLOR_MAGENTA
void
logger_log(FILE *stream, log_level_t level, const char *filename, int line, const char *func, const char *msg, ...)
{ {
if(global_config.log_level < level)
{
return;
}
switch(level)
{
case LOG_LEVEL_TRACE:
fprintf(stream, COLOR_TRACE "[TRACE] ");
break;
case LOG_LEVEL_DEBUG:
fprintf(stream, COLOR_DEBUG "[DEBUG] ");
break;
case LOG_LEVEL_INFO:
fprintf(stream, COLOR_INFO "[INFO ] ");
break;
case LOG_LEVEL_WARN:
fprintf(stream, COLOR_WARN "[WARN ] ");
break;
case LOG_LEVEL_ERROR:
fprintf(stream, COLOR_ERROR "[ERROR] ");
break;
case LOG_LEVEL_FATAL:
fprintf(stream, COLOR_FATAL "[FATAL] ");
break;
default:
fprintf(stream, COLOR_NONE "[LOG ] ");
break;
}
char timestamp_str[32];
time_t rawtime; time_t rawtime;
time(&rawtime); time(&rawtime);
strftime(_LOGGER_TIMESTAMP, _LOGGER_TIMESTAMP_SIZE, "%Y-%m-%d %H:%M:%S", localtime(&rawtime)); strftime(timestamp_str, 32, "%Y-%m-%d %H:%M:%S", localtime(&rawtime));
return _LOGGER_TIMESTAMP;
fprintf(stream, "%s %s:%d:%s " COLOR_NONE, timestamp_str, filename, line, func);
va_list args;
va_start(args, msg);
vfprintf(stream, msg, args);
va_end(args);
} }

14
main.c
View file

@ -32,7 +32,7 @@ static struct pollfd poll_fds[POLL_FDS_COUNT];
static void static void
terminate(int signum) terminate(int signum)
{ {
LOG_INFO("terminating controller (%d)", signum); LOG_INFO("terminating controller (%d)\n", signum);
for(int i = 0; i < POLL_FDS_COUNT; ++i) for(int i = 0; i < POLL_FDS_COUNT; ++i)
{ {
@ -69,18 +69,20 @@ main(int argc, const char** argv)
/******************** LOAD CONFIG ********************/ /******************** LOAD CONFIG ********************/
global_config.file = "controller.ini"; global_config.file = "controller.ini";
global_config.database = "controller_db.lmdb";
global_config.log_level = LOG_LEVEL_INFO;
helpers_parse_cli(argc, argv, &global_config); helpers_parse_cli(argc, argv, &global_config);
FILE * const ini_file = fopen(global_config.file, "rb"); FILE * const ini_file = fopen(global_config.file, "rb");
if(ini_file == NULL) if(ini_file == NULL)
{ {
LOG_FATAL("config file '%s' was not found", global_config.file); LOG_FATAL("config file '%s' was not found\n", global_config.file);
exit(1); exit(1);
} }
if(load_ini_file( ini_file, INI_DEFAULT_FORMAT, NULL, helper_load_config, &global_config)) if(load_ini_file( ini_file, INI_DEFAULT_FORMAT, NULL, helper_load_config, &global_config))
{ {
LOG_FATAL("unable to parse ini file"); LOG_FATAL("unable to parse ini file\n");
exit(1); exit(1);
} }
@ -88,7 +90,7 @@ main(int argc, const char** argv)
if(sizeof(time_t) < 8) if(sizeof(time_t) < 8)
{ {
LOG_WARN("this system is not using 8-bit time"); LOG_WARN("this system is not using 8-bit time\n");
} }
/******************** SETUP DATABASE AND THIS CONTROLLER ********************/ /******************** SETUP DATABASE AND THIS CONTROLLER ********************/
@ -127,10 +129,10 @@ main(int argc, const char** argv)
/* Open STREAMS device. */ /* Open STREAMS device. */
poll_fds[POLL_FDS_DISCOVERY].fd = fd_discovery; poll_fds[POLL_FDS_DISCOVERY].fd = fd_discovery;
poll_fds[POLL_FDS_DISCOVERY].events = POLLIN; poll_fds[POLL_FDS_DISCOVERY].events = POLLIN;
LOG_DEBUG("setup fd_discovery as %i on index %i", fd_discovery, POLL_FDS_DISCOVERY); LOG_DEBUG("setup fd_discovery as %i on index %i\n", fd_discovery, POLL_FDS_DISCOVERY);
poll_fds[POLL_FDS_COMMAND].fd = fd_command; poll_fds[POLL_FDS_COMMAND].fd = fd_command;
poll_fds[POLL_FDS_COMMAND].events = POLLIN; poll_fds[POLL_FDS_COMMAND].events = POLLIN;
LOG_DEBUG("setup fd_command as %i on index %i", fd_command, POLL_FDS_COMMAND); LOG_DEBUG("setup fd_command as %i on index %i\n", fd_command, POLL_FDS_COMMAND);
/******************** CHECK FOR TESTING RUN ********************/ /******************** CHECK FOR TESTING RUN ********************/

Some files were not shown because too many files have changed in this diff Show more