Commit Diff

Commit:
5330ab762909f51f51f564f8b8af9eac9c8f4354
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
drop double process name from some gotd logs i.e. "listen: listen: shutting down" -> "listen: shutting down" the procname is already prepended by vlog() ok jamsek
Actions:
Patch | Tree
commit - b29d689bdb0acd6ef758897f0ed1db91172f931a
commit + 5330ab762909f51f51f564f8b8af9eac9c8f4354
blob - 01a705f61574e2653156dbe6ccb60035616515ac
blob + bf64d2744e1d5ba3fab4b5543aa89d7eeed41534
--- gotd/auth.c
+++ gotd/auth.c
@@ -266,11 +266,10 @@ auth_dispatch(int fd, short event, void *arg)
 		case GOTD_IMSG_AUTHENTICATE:
 			err = recv_authreq(&imsg, iev);
 			if (err)
-				log_warnx("%s: %s", gotd_auth.title, err->msg);
+				log_warnx("%s", err->msg);
 			break;
 		default:
-			log_debug("%s: unexpected imsg %d", gotd_auth.title,
-			    imsg.hdr.type);
+			log_debug("unexpected imsg %d", imsg.hdr.type);
 			break;
 		}
 
@@ -332,6 +331,6 @@ auth_main(const char *title, struct gotd_repolist *rep
 static void
 auth_shutdown(void)
 {
-	log_debug("%s: shutting down", gotd_auth.title);
+	log_debug("shutting down");
 	exit(0);
 }
blob - 0244dadfadb3fbe5d3d608eaee023f5df9744ce8
blob + caeacc5c09a64de9669eb5370d3ac0cbb3071b45
--- gotd/listen.c
+++ gotd/listen.c
@@ -435,12 +435,10 @@ listen_dispatch(int fd, short event, void *arg)
 		case GOTD_IMSG_DISCONNECT:
 			err = recv_disconnect(&imsg);
 			if (err)
-				log_warnx("%s: disconnect: %s",
-				    gotd_listen.title, err->msg);
+				log_warnx("disconnect: %s", err->msg);
 			break;
 		default:
-			log_debug("%s: unexpected imsg %d", gotd_listen.title,
-			    imsg.hdr.type);
+			log_debug("unexpected imsg %d", imsg.hdr.type);
 			break;
 		}
 
@@ -506,7 +504,7 @@ listen_main(const char *title, int gotd_socket,
 static void
 listen_shutdown(void)
 {
-	log_debug("%s: shutting down", gotd_listen.title);
+	log_debug("shutting down");
 
 	free(gotd_listen.connection_limits);
 	if (gotd_listen.fd != -1)
blob - d7e43c48876932a301c2aa803f93172a823359ec
blob + e56cd47cb6f50b93b2fe70db937b9c3beabcb04f
--- gotd/session.c
+++ gotd/session.c
@@ -1481,7 +1481,7 @@ done:
 void
 gotd_session_shutdown(void)
 {
-	log_debug("%s: shutting down", gotd_session.title);
+	log_debug("shutting down");
 	if (gotd_session.repo)
 		got_repo_close(gotd_session.repo);
 	got_repo_pack_fds_close(gotd_session.pack_fds);