RPi: Log refactor

This commit is contained in:
Marcelo Aquino
2016-10-18 16:55:47 -02:00
parent 75aad5de35
commit 2be804a1ef
13 changed files with 196 additions and 80 deletions
+11 -11
View File
@@ -57,26 +57,26 @@ void EthernetServer::begin(IPAddress address)
sprintf(portstr, "%d", port);
if ((rv = getaddrinfo(address.toString().c_str(), portstr, &hints, &servinfo)) != 0) {
mys_log(LOG_ERR, "getaddrinfo: %s\n", gai_strerror(rv));
logError("getaddrinfo: %s\n", gai_strerror(rv));
return;
}
// loop through all the results and bind to the first we can
for (p = servinfo; p != NULL; p = p->ai_next) {
if ((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {
mys_log(LOG_ERR, "socket: %s\n", strerror(errno));
logError("socket: %s\n", strerror(errno));
continue;
}
if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) {
mys_log(LOG_ERR, "setsockopt: %s\n", strerror(errno));
logError("setsockopt: %s\n", strerror(errno));
freeaddrinfo(servinfo);
return;
}
if (bind(sockfd, p->ai_addr, p->ai_addrlen) == -1) {
close(sockfd);
mys_log(LOG_ERR, "bind: %s\n", strerror(errno));
logError("bind: %s\n", strerror(errno));
continue;
}
@@ -84,13 +84,13 @@ void EthernetServer::begin(IPAddress address)
}
if (p == NULL) {
mys_log(LOG_ERR, "Failed to bind!\n");
logError("Failed to bind!\n");
freeaddrinfo(servinfo);
return;
}
if (listen(sockfd, ETHERNETSERVER_BACKLOG) == -1) {
mys_log(LOG_ERR, "listen: %s\n", strerror(errno));
logError("listen: %s\n", strerror(errno));
freeaddrinfo(servinfo);
return;
}
@@ -102,7 +102,7 @@ void EthernetServer::begin(IPAddress address)
struct sockaddr_in *ipv4 = (struct sockaddr_in *)p->ai_addr;
void *addr = &(ipv4->sin_addr);
inet_ntop(p->ai_family, addr, ipstr, sizeof ipstr);
mys_log(LOG_DEBUG, "Listening for connections on %s:%s\n", ipstr, portstr);
logDebug("Listening for connections on %s:%s\n", ipstr, portstr);
}
bool EthernetServer::hasClient()
@@ -142,7 +142,7 @@ size_t EthernetServer::write(const uint8_t *buffer, size_t size)
client.stop();
clients[i] = clients.back();
clients.pop_back();
mys_log(LOG_DEBUG, "Client disconnected.\n");
logDebug("Client disconnected.\n");
}
}
@@ -194,7 +194,7 @@ void EthernetServer::_accept()
}
}
if (no_free_slots) {
mys_log(LOG_DEBUG, "Max number of ethernet clients reached.\n");
logDebug("Max number of ethernet clients reached.\n");
return;
}
}
@@ -203,7 +203,7 @@ void EthernetServer::_accept()
new_fd = accept(sockfd, (struct sockaddr *)&client_addr, &sin_size);
if (new_fd == -1) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
mys_log(LOG_ERR, "accept: %s\n", strerror(errno));
logError("accept: %s\n", strerror(errno));
}
return;
}
@@ -213,5 +213,5 @@ void EthernetServer::_accept()
void *addr = &(((struct sockaddr_in*)&client_addr)->sin_addr);
inet_ntop(client_addr.ss_family, addr, ipstr, sizeof ipstr);
mys_log(LOG_DEBUG, "New connection from %s\n", ipstr);
logDebug("New connection from %s\n", ipstr);
}