Skip to content
This repository was archived by the owner on Jul 2, 2019. It is now read-only.

Commit 35a71f1

Browse files
peffgitster
authored andcommitted
credential-cache: ignore "connection refused" errors
The credential-cache helper will try to connect to its daemon over a unix socket. Originally, a failure to do so was silently ignored, and we would either give up (if performing a "get" or "erase" operation), or spawn a new daemon (for a "store" operation). But since 8ec6c8d, we try to report more errors. We detect a missing daemon by checking for ENOENT on our connection attempt. If the daemon is missing, we continue as before (giving up or spawning a new daemon). For any other error, we die and report the problem. However, checking for ENOENT is not sufficient for a missing daemon. We might also get ECONNREFUSED if a dead daemon process left a stale socket. This generally shouldn't happen, as the daemon cleans up after itself, but the daemon may not always be given a chance to do so (e.g., power loss, "kill -9"). The resulting state is annoying not just because the helper outputs an extra useless message, but because it actually blocks the helper from spawning a new daemon to replace the stale socket. Fix it by checking for ECONNREFUSED. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 06121a0 commit 35a71f1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

credential-cache.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static void do_cache(const char *socket, const char *action, int timeout,
7272
}
7373

7474
if (send_request(socket, &buf) < 0) {
75-
if (errno != ENOENT)
75+
if (errno != ENOENT && errno != ECONNREFUSED)
7676
die_errno("unable to connect to cache daemon");
7777
if (flags & FLAG_SPAWN) {
7878
spawn_daemon(socket);

0 commit comments

Comments
 (0)