From: Salvatore Sanfilippo <antirez@gmail.com>
Date: Mon, 10 Oct 2011 20:05:16 +0000 (-0700)
Subject: Merge pull request #126 from florean/unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/70cb03e172a892e75542d895932b320ee7bf5167?hp=-c

Merge pull request #126 from florean/unstable

Unlink Unix socket file on shutdown
---

70cb03e172a892e75542d895932b320ee7bf5167
diff --combined src/redis.c
index 314a430e,295936df..658d2486
--- a/src/redis.c
+++ b/src/redis.c
@@@ -822,6 -822,7 +822,7 @@@ void initServerConfig() 
      server.port = REDIS_SERVERPORT;
      server.bindaddr = NULL;
      server.unixsocket = NULL;
+     server.unixsocketperm = 0;
      server.ipfd = -1;
      server.sofd = -1;
      server.dbnum = REDIS_DEFAULT_DBNUM;
@@@ -935,7 -936,7 +936,7 @@@ void initServer() 
      }
      if (server.unixsocket != NULL) {
          unlink(server.unixsocket); /* don't care if this fails */
-         server.sofd = anetUnixServer(server.neterr,server.unixsocket);
+         server.sofd = anetUnixServer(server.neterr,server.unixsocket,server.unixsocketperm);
          if (server.sofd == ANET_ERR) {
              redisLog(REDIS_WARNING, "Opening socket: %s", server.neterr);
              exit(1);
@@@ -1236,6 -1237,10 +1237,10 @@@ int prepareForShutdown() 
      /* Close the listening sockets. Apparently this allows faster restarts. */
      if (server.ipfd != -1) close(server.ipfd);
      if (server.sofd != -1) close(server.sofd);
+     if (server.unixsocket) {
+         redisLog(REDIS_NOTICE,"Removing the unix socket file.");
+         unlink(server.unixsocket); /* don't care if this fails */
+     }
  
      redisLog(REDIS_WARNING,"Redis is now ready to exit, bye bye...");
      return REDIS_OK;
@@@ -1510,10 -1515,10 +1515,10 @@@ sds genRedisInfoString(char *section) 
          "used_cpu_user:%.2f\r\n"
          "used_cpu_sys_children:%.2f\r\n"
          "used_cpu_user_children:%.2f\r\n",
 -        (float)self_ru.ru_utime.tv_sec+(float)self_ru.ru_utime.tv_usec/1000000,
          (float)self_ru.ru_stime.tv_sec+(float)self_ru.ru_stime.tv_usec/1000000,
 -        (float)c_ru.ru_utime.tv_sec+(float)c_ru.ru_utime.tv_usec/1000000,
 -        (float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000);
 +        (float)self_ru.ru_utime.tv_sec+(float)self_ru.ru_utime.tv_usec/1000000,
 +        (float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000,
 +        (float)c_ru.ru_utime.tv_sec+(float)c_ru.ru_utime.tv_usec/1000000);
      }
  
      /* cmdtime */