Changeset 5857

Timestamp:

May 20, 2008, 2:01:15 PM (14 years ago)

Author:

charles

Message:

tweak the daemon & remote console messages a little

Location:

trunk/daemon

Files:

• daemon.c (modified) (5 diffs)
• remote.c (modified) (3 diffs)

trunk/daemon/daemon.c

@@ -64 +64 @@
     tr_bencDictAddStr( &d, "encryption", str );
 
-    tr_ninf( MY_NAME, "saving \"%s\"\n", gl_configfile );
+    tr_ninf( MY_NAME, "saving \"%s\"", gl_configfile );
     tr_bencSaveFile( gl_configfile, &d );
 
@@ -207 +207 @@
             break;
         case -1:
-            tr_nerr( MY_NAME, "Error daemonizing (fork)! %d - %s\n", errno, strerror(errno) );
+            tr_nerr( MY_NAME, "Error daemonizing (fork)! %d - %s", errno, strerror(errno) );
             return -1;
         default:
@@ -214 +214 @@
 
     if( setsid() < 0 ) {
-        tr_nerr( MY_NAME, "Error daemonizing (setsid)! %d - %s\n", errno, strerror(errno) );
+        tr_nerr( MY_NAME, "Error daemonizing (setsid)! %d - %s", errno, strerror(errno) );
         return -1;
     }
@@ -222 +222 @@
             break;
         case -1:
-            tr_nerr( MY_NAME, "Error daemonizing (fork2)! %d - %s\n", errno, strerror(errno) );
+            tr_nerr( MY_NAME, "Error daemonizing (fork2)! %d - %s", errno, strerror(errno) );
             return -1;
         default:
@@ -229 +229 @@
 
     if( !nochdir && 0 > chdir( "/" ) ) {
-        tr_nerr( MY_NAME, "Error daemonizing (chdir)! %d - %s\n", errno, strerror(errno) );
+        tr_nerr( MY_NAME, "Error daemonizing (chdir)! %d - %s", errno, strerror(errno) );
         return -1;
     }

trunk/daemon/remote.c

@@ -259 +259 @@
 
 static void
-processResponse( const void * response, size_t len )
+processResponse( const char * host, int port,
+                 const void * response, size_t len )
 {
     tr_benc top;
 
     if( tr_jsonParse( response, len, &top, NULL ) )
-       tr_nerr( MY_NAME, "Unable to parse response\n" );
+       tr_nerr( MY_NAME, "Unable to parse response" );
     else
     {
@@ -273 +274 @@
 
         if( tr_bencDictFindStr( &top, "result", &str ) )
-            printf( "Server responded: \"%s\"\n", str );
+            printf( "%s:%d responded: \"%s\"\n", host, port, str );
 
         if( ( tag == TAG_LIST ) &&
@@ -329 +330 @@
         curl_easy_setopt( curl, CURLOPT_POSTFIELDS, reqs[i] );
         if(( res = curl_easy_perform( curl )))
-            tr_nerr( MY_NAME, "%s\n", curl_easy_strerror( res ) );
+            tr_nerr( MY_NAME, "(%s:%d) %s", host, port, curl_easy_strerror( res ) );
         else
-            processResponse( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+            processResponse( host, port, EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
 
         evbuffer_drain( buf, EVBUFFER_LENGTH( buf ) );