Merge pull request #347 from xmidt-org/4.1_pb

4.1 pb

CHANGELOG.md

@@ -22,7 +22,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Update retry timestamp in connection-health-file
 - fix so that parodus can be killed, even if in a connection fail loop
 - provide signal handlers so we shut down properly when INCLUDE_BREAKPAD active
-- send status code and reason in websocket close message 
+- send status code and reason in websocket close message
+- dont try to install handler for signal 9 
 
 ## [1.0.2] - 2019-02-08
 - Refactored connection.c and updated corresponding unit tests

src/connection.c

@@ -509,7 +509,7 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
   if(wait_status == 307 || wait_status == 302 || wait_status == 303)    // only when there is a http redirect
   {
 	char *redirect_ptr = redirectURL;
-	ParodusError("Received temporary redirection response message %s\n", redirectURL);
+	ParodusInfo("Received temporary redirection response message %s\n", redirectURL);
 	// Extract server Address and port from the redirectURL
 	if (strncmp (redirect_ptr, "Redirect:", 9) == 0)
 	    redirect_ptr += 9;
@@ -641,18 +641,17 @@ int wait_while_interface_down()
 	close_and_unref_connection (get_global_conn());
 	set_global_conn(NULL);
 
-	pthread_mutex_lock(get_interface_down_mut());
-	while (!get_interface_down_event ()) {
+	while (get_interface_down_event ()) {
+	  pthread_mutex_lock(get_interface_down_mut());
   	  rtn = pthread_cond_wait(get_interface_down_con(), get_interface_down_mut());
+      pthread_mutex_unlock (get_interface_down_mut());
   	  if (rtn != 0)
   	    ParodusError 
   	      ("Error on pthread_cond_wait (%d) in wait_while_interface_down\n", rtn);
   	  if ((rtn != 0) || g_shutdown) {
-	    pthread_mutex_unlock (get_interface_down_mut());
 	    return -1;
 	  }
 	}
-    pthread_mutex_unlock (get_interface_down_mut());
     return 0;
 }
 

src/main.c

@@ -82,7 +82,6 @@ int main( int argc, char **argv)
     signal(SIGINT, sig_handler);
 	signal(SIGUSR1, sig_handler);
 	signal(SIGUSR2, sig_handler);
-	signal(SIGKILL, sig_handler);
 	signal(SIGQUIT, sig_handler);
 	signal(SIGHUP, sig_handler);   
 	signal(SIGALRM, sig_handler);

src/nopoll_helpers.c

@@ -146,7 +146,7 @@ void __report_log (noPollCtx * ctx, noPollDebugLevel level, const char * log_msg
     
     if (level == NOPOLL_LEVEL_DEBUG) 
     {
-        //ParodusPrint("%s\n", log_msg);
+        ParodusInfo("%s\n", log_msg);
     }
     if (level == NOPOLL_LEVEL_INFO) 
     {
@@ -154,7 +154,7 @@ void __report_log (noPollCtx * ctx, noPollDebugLevel level, const char * log_msg
     }
     if (level == NOPOLL_LEVEL_WARNING) 
     {
-        ParodusPrint("%s\n", log_msg);
+        ParodusInfo("%s\n", log_msg);
     }
     if (level == NOPOLL_LEVEL_CRITICAL) 
     {