Changeset 531eabd for protocols/rpc/rpc.c

Timestamp:

2015-05-04T21:56:58Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b1dc403

Parents:

f15553d

Message:

Some more logging at RPC init time.

Through the logging subsystem which still doesn't really work...

File:

• protocols/rpc/rpc.c (modified) (8 diffs)

protocols/rpc/rpc.c

@@ -174 +174 @@
                  * I don't want to do.
                  * Should a module want to override a user's setting, it can
-                 * use set_setstr(). (Though ATM setting changes are not yet
-                 * passed to the module immediately. TODO. */
+                 * use set_setstr(). */
         }
 
@@ -780 +779 @@
 }
 
-void rpc_initmodule_sock(struct sockaddr *address, socklen_t addrlen) {
+gboolean rpc_initmodule_sock(struct sockaddr *address, socklen_t addrlen) {
         int st, fd, i;
 
         fd = socket(address->sa_family, SOCK_STREAM, 0);
-        if (fd == -1 || connect(fd, address, addrlen) == -1)
-                return;
+        if (fd == -1 || connect(fd, address, addrlen) == -1) {
+                log_message(LOGLVL_WARNING, "Failed to connect to RPC server: %s", strerror(errno));
+                if (fd != -1)
+                        closesocket(fd);
+                return FALSE;
+        }
 
         JSON_Value *rpc = rpc_init_isup();
@@ -797 +800 @@
 
         if ((st = write(fd, s, len)) != len) {
-                // LOG ERROR
-                return;
+                log_message(LOGLVL_WARNING, "Error while writing to RPC server: %s", strerror(errno));
+                return FALSE;
         }
         g_free(s);
@@ -816 +819 @@
 
                 if (st == 0) {
-                        // LOG ERROR
+                        log_message(LOGLVL_WARNING, "Error while reading from RPC server: %s", strerror(errno));
                         closesocket(fd);
-                        return;
+                        return FALSE;
                 }
                 
@@ -828 +831 @@
                         if (sockerr_again())
                                 continue;
-                        // LOG ERROR
+                        log_message(LOGLVL_WARNING, "Error while reading from RPC server: %s", strerror(errno));
                         closesocket(fd);
-                        return;
+                        return FALSE;
                 }
                 resplen += st;
@@ -840 +843 @@
         JSON_Object *isup = json_object_get_object(json_object(parsed), "result");
         if (isup == NULL) {
-                // LOG ERROR
-                return;
+                log_message(LOGLVL_WARNING, "Error while parsing RPC server response");
+                return FALSE;
         }
 
@@ -903 +906 @@
         
         register_protocol(ret);
+
+        return TRUE;
 }
 
@@ -921 +926 @@
 
         while ((de = readdir(pdir))) {
+                if (de->d_type != DT_SOCK && de->d_type != DT_UNKNOWN)
+                        continue;
+
                 char *fn = g_build_filename(PDIR, de->d_name, NULL);
                 struct sockaddr_un su;
 
                 strncpy(su.sun_path, fn, UNIX_PATH_MAX);
+
+#if 0
+                struct stat fdata;
+                if (stat(fn, &fdata) == -1) {
+                        log_message(LOGLVL_WARNING, "Could not stat %s: %s", fn, strerror(errno));
+                        g_free(fn);
+                        continue;
+                }
+                /* For now just skip anything that is not a Unix domain socket. */
+                if (!S_ISSOCK(fdata.st_mode))
+                        continue;
+#endif
+
                 su.sun_path[UNIX_PATH_MAX-1] = '\0';
                 su.sun_family = AF_UNIX;
-                rpc_initmodule_sock((struct sockaddr*) &su, sizeof(su));
+                gboolean st = rpc_initmodule_sock((struct sockaddr*) &su, sizeof(su));
                 g_free(fn);
+                if (!st)
+                        log_message(LOGLVL_WARNING, "Failed to register protocol %s", fn);
                 /* Idea: Also support textfiles containing a host:port tuple to
                  * connect to. Not that remote RPC'ing would be a great idea,
                  * but maybe some jsonrpc libs don't support Unix domain sockets. */
         }
-}
-
+        closedir(pdir);
+}
+