Permalink
Browse files

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.
  • Loading branch information...
1 parent c1158e3 commit 0ae6a5ea89710a1958f2284bbac4bcc98b7155c4 @juphoff juphoff committed Oct 26, 2012
Showing with 282 additions and 271 deletions.
  1. +4 −2 cluster/handlers.c
  2. +254 −254 node/handlers.c
  3. +6 −6 tools/eucalyptus.conf
  4. +17 −8 util/sensor.c
  5. +1 −1 util/sensor.h
View
@@ -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");
Oops, something went wrong.

0 comments on commit 0ae6a5e

Please sign in to comment.