Restore CC/NC changes to handle dynamic changes in log levels.

Fixes EUCA-3861 Revert "Reverting couple recent back-end changes" This reverts commit 04716d4.
eucalyptus · Oct 26, 2012 · 0ae6a5e · 0ae6a5e
1 parent c1158e3
commit 0ae6a5e
Show file tree

Hide file tree

Showing 5 changed files with 282 additions and 271 deletions.
diff --git a/cluster/handlers.c b/cluster/handlers.c
@@ -3489,14 +3489,16 @@ int init_pthreads() {
 	sigprocmask(SIG_SETMASK, &newsigact.sa_mask, NULL);
 	sigaction(SIGTERM, &newsigact, NULL);
 	logprintfl (EUCADEBUG, "sensor polling process running\n");
-	if (sensor_init (s, ccSensorResourceCache, MAX_SENSOR_RESOURCES, TRUE)==ERROR) // this call will not return
+	logprintfl (EUCATRACE, "calling sensor_init() to not return.\n");
+	if (sensor_init (s, ccSensorResourceCache, MAX_SENSOR_RESOURCES, TRUE, update_config)==ERROR) // this call will not return
 	  logprintfl (EUCAERROR, "failed to invoke the sensor polling process\n");
 	exit(0);
       } else {
 	config->threads[SENSOR] = pid;
       }
     }
-    if (sensor_init (s, ccSensorResourceCache, MAX_SENSOR_RESOURCES, FALSE)==ERROR) { // this call will return
+    logprintfl (EUCATRACE, "calling sensor_init(..., NULL) to return.\n");
+    if (sensor_init (s, ccSensorResourceCache, MAX_SENSOR_RESOURCES, FALSE, NULL)==ERROR) { // this call will return
       logprintfl (EUCAERROR, "failed to initialize sensor subsystem in this process\n");
     } else {
       logprintfl (EUCADEBUG, "sensor subsystem initialized in this process\n");