From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 30 Sep 2011 00:38:08 +0000 (-0600)
Subject: Properly log errors in server
X-Git-Tag: fio-1.99~87
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=690e09aeff6111f0654899840280196cf8c96224

Properly log errors in server

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/server.c b/server.c
index 28055152..5ef0fe01 100644
--- a/server.c
+++ b/server.c
@@ -55,7 +55,7 @@ again:
 
 	sk = accept(listen_sk, &addr, &len);
 	if (sk < 0) {
-		log_err("fio: accept failed\n");
+		log_err("fio: accept: %s\n", strerror(errno));
 		return -1;
 	}
 
@@ -98,18 +98,18 @@ int fio_server(void)
 
 	sk = socket(AF_INET, SOCK_STREAM, 0);
 	if (sk < 0) {
-		log_err("fio: socket\n");
+		log_err("fio: socket: %s\n", strerror(errno));
 		return -1;
 	}
 
 	opt = 1;
 	if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
-		log_err("fio: setsockopt\n");
+		log_err("fio: setsockopt: %s\n", strerror(errno));
 		return -1;
 	}
 #ifdef SO_REUSEPORT
 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
-		td_verror(td, errno, "setsockopt");
+		log_err("fio: setsockopt: %s\n", strerror(errno));
 		return 1;
 	}
 #endif
@@ -119,19 +119,18 @@ int fio_server(void)
 	saddr_in.sin_port = htons(net_port);
 
 	if (bind(sk, (struct sockaddr *) &saddr_in, sizeof(saddr_in)) < 0) {
-		perror("bind");
-		log_err("fio: bind\n");
+		log_err("fio: bind: %s\n", strerror(errno));
 		return -1;
 	}
 
 	if (listen(sk, 1) < 0) {
-		log_err("fio: listen\n");
+		log_err("fio: listen: %s\n", strerror(errno));
 		return -1;
 	}
 
 	len = sizeof(addr);
 	if (getsockname(sk, &addr, &len) < 0) {
-		log_err("fio: getsockname");
+		log_err("fio: getsockname: %s\n", strerror(errno));
 		return -1;
 	}