Changeset 1678

Timestamp:

23/06/10 14:18:25 (3 years ago)

Author:

matthijs

Message:

let fonstate / fs log to syslog instead of stderr

Files:

• trunk/fon/fonstate/src/net/socket.c (modified) (7 diffs)

trunk/fon/fonstate/src/net/socket.c

@@ -21 +21 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <unistd.h>
 #include <string.h>
@@ -29 +30 @@
 #include <fcntl.h>
 #include <lib/state.h>
+#include <lib/log.h>
 
 #define SOCKET_PATH "/tmp/fonstated.sock"
@@ -46 +48 @@
         if((fon_socket.listener = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
         {
-                perror("socket");
+                log_printf("Failed to open socket: %s\n", strerror(errno));
                 return 1;
         }
@@ -52 +54 @@
                                 SO_REUSEADDR, &yes, sizeof(int)) == -1)
         {
-                perror("setsockopt");
+                log_printf("Failed to set socket options: %s\n", strerror(errno));
                 return 1;
         }
@@ -61 +63 @@
         if(bind(fon_socket.listener, (struct sockaddr *)&myaddr, len) == -1)
         {
-                perror("bind");
+                log_printf("Failed to bind socket to path (%s): %s\n", myaddr.sun_path, strerror(errno));
                 return 1;
         }
@@ -86 +88 @@
 
         if((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
+        {
+                log_printf("Failed to open socket: %s\n", strerror(errno));
                 return;
+        }
         remote.sun_family = AF_UNIX;
         strcpy(remote.sun_path, SOCKET_PATH);
@@ -92 +97 @@
         if(connect(s, (struct sockaddr *)&remote, len) == -1)
         {
-                perror("connect");
+                log_printf("Failed to connect to socket (%s): %s\n", remote.sun_path, strerror(errno));
                 goto out;
         }
         if(send(s, str, strlen(str), 0) == -1)
         {
-                perror("send");
+                log_printf("Failed to send message (%s): %s\n", str, strerror(errno));
                 goto out;
         }