Skip to content

Commit b1442e6

Browse files
committed
Issue #21: Logging implemented in main.cpp. Created special file with logging includes
1 parent 3777116 commit b1442e6

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#ifndef LOGGINGINCLUDES_H
2+
#define LOGGINGINCLUDES_H
3+
4+
#pragma once
5+
#include <glog/logging.h>
6+
7+
#define LOG_DEBUG VLOG(1) << "[DEBUG] "
8+
#define LOG_INFO LOG(INFO) << "[INFO] "
9+
#define LOG_WARNING LOG(WARNING) << "[WARNING] "
10+
#define LOG_ERROR LOG(ERROR) << "[ERROR] "
11+
#define LOG_FATAL LOG(FATAL) << "[FATAL ERROR] "
12+
13+
#endif

src/kpi_rover_ecu/src/main.cpp

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <netdb.h>
44
#include <netinet/in.h>
55
#include <sys/socket.h>
6+
#include <glog/logging.h>
67

78
#include <chrono>
89
#include <csignal>
@@ -17,6 +18,7 @@
1718
#include "KPIRoverECU.h"
1819
#include "TCPTransport.h"
1920
#include "UDPClient.h"
21+
#include "loggingIncludes.h"
2022
#include "motorConfig.h"
2123
#include "motorsController.h"
2224
#include "protocolHandler.h"
@@ -34,25 +36,42 @@ int main(int argc, char* argv[]) {
3436
const int kDefaultPortNum = 5500;
3537
const int kBase = 10; // Named constant for base 10
3638
int server_portnum = kDefaultPortNum;
39+
int log_level = 1;
3740

3841
// Command-line options
3942
int opt = 0;
40-
while ((opt = getopt(argc, argv, "a:p:")) != -1) {
43+
while ((opt = getopt(argc, argv, "a:p:l:")) != -1) {
4144
switch (opt) {
4245
case 'a':
4346
server_address = optarg;
4447
break;
4548
case 'p':
4649
server_portnum = strtol(optarg, nullptr, kBase);
4750
break;
51+
case 'l':
52+
log_level = strtol(optarg, nullptr, kBase);
53+
break;
4854
default:
4955
std::cout << "Usage: " << argv[0] << '\n';
5056
std::cout << " [-a server_address] " << '\n';
5157
std::cout << " [-p server_portnum]" << '\n';
58+
std::cout << " [-l log level]" << '\n';
5259
return EXIT_FAILURE;
5360
}
5461
}
5562
// sem_init(&stopProgramSem, 0, 0);
63+
/* Glog initializing */
64+
google::InitGoogleLogging(argv[0]);
65+
if (log_level == 0) {
66+
FLAGS_stderrthreshold = 0;
67+
FLAGS_v = 1;
68+
} else if (log_level >= 1 && log_level <= 4) {
69+
FLAGS_stderrthreshold = log_level - 1;
70+
} else {
71+
FLAGS_stderrthreshold = 0;
72+
}
73+
FLAGS_log_dir = "./log";
74+
LOG_INFO << "Logger was set up";
5675

5776
MotorController motors_processor;
5877
const uint8_t kMotorNumber = 4;

0 commit comments

Comments
 (0)