control event logs include loglevel notice

svn:r2746

diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index 63b5a0a31b63cc27be3e5bed352b907b6ecc182b..8f2f2d8c06723e2bf821cbcd59e053c3847ea597 100644 (file)
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -174,13 +174,12 @@ the message.
                    (Launched=0,connected=1,failed=2,closed=3)
                 OR nickname/identity [NUL-terminated]
 
-      0x0004 -- Bandwidth used in last N seconds.
+      0x0004 -- Bandwidth used in the last second
 
-                Number of seconds covered in interval [2 octets]
                 Bytes read [4 octets]
                 Bytes written [4 octets]
 
-      0x0005 -- Warning/error occurred
+      0x0005 -- Notice/warning/error occurred
 
                 Message [NUL-terminated]
 

diff --git a/src/or/config.c b/src/or/config.c
index 66aa4918ed1553b48accc33e78cf0f7a17638554..87d0651a5610cdf05fea07dc0530a8af29cd9608 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -262,7 +262,7 @@ options_act(void) {
   /* Close the temporary log we used while starting up, if it isn't already
    * gone. */
   close_temp_logs();
-  add_callback_log(LOG_WARN, LOG_ERR, control_event_logmsg);
+  add_callback_log(LOG_NOTICE, LOG_ERR, control_event_logmsg);
 
   /* Start backgrounding the process, if requested. */
   if (options->RunAsDaemon) {