Changeset 03fbf66

Timestamp:

Aug 16, 2017, 12:53:41 PM (7 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

94b4b99e

Parents:

42779f8

git-author:

Jason Gross <jgross@mit.edu> (07/12/11 19:08:45)

git-committer:

Jason Gross <jasongross9@gmail.com> (08/16/17 12:53:41)

Message:

Moved the last of the logging-related variables to perl

We seem to have picked logpath as the string variable we test in
tester.c.  Since this is no longer in C, I've replaced it with
personalbell (no particular reason for that choice).

Files:

• perl/lib/BarnOwl/Logging.pm (modified) (1 diff)
• tester.c (modified) (1 diff)
• variable.c (modified) (2 diffs)

perl/lib/BarnOwl/Logging.pm

@@ -77 +77 @@
                          . "for AIM, zephyr, or other protocols.  If disabled BarnOwl will not print\n"
                          . "login or logout notifications."
+        });
+
+    BarnOwl::new_variable_enum('loggingdirection',
+        {
+            default       => 'both',
+            validsettings => [qw(in out both)],
+            summary       => "specifies which kind of messages should be logged",
+            description   => "Can be one of 'both', 'in', or 'out'.  If 'in' is\n"
+                           . "selected, only incoming messages are logged, if 'out'\n"
+                           . "is selected only outgoing messages are logged.  If 'both'\n"
+                           . "is selected both incoming and outgoing messages are\n"
+                           . "logged."
+        });
+
+    BarnOwl::new_variable_string('logpath',
+        {
+            default       => '~/zlog/people',
+            validsettings => '<path>',
+            summary       => 'path for logging personal messages',
+            description   => "Specifies a directory which must exist.\n"
+                            . "Files will be created in the directory for each sender."
+        });
+
+    BarnOwl::new_variable_string('classlogpath',
+        {
+            default       => '~/zlog/class',
+            validsettings => '<path>',
+            summary       => 'path for logging class zephyrs',
+            description   => "Specifies a directory which must exist.\n"
+                           . "Files will be created in the directory for each class."
         });
 }

tester.c

@@ -357 +357 @@
 
 
-  FAIL_UNLESS("get string var", NULL != (var = owl_variable_get_var(&vd, "logpath")));
-  FAIL_UNLESS("get string", 0 == strcmp("~/zlog/people", owl_variable_get_string(var)));
+  FAIL_UNLESS("get string var", NULL != (var = owl_variable_get_var(&vd, "personalbell")));
+  FAIL_UNLESS("get string", 0 == strcmp("off", owl_variable_get_string(var)));
   FAIL_UNLESS("set string 7", 0 == owl_variable_set_string(var, "whee"));
   FAIL_UNLESS("get string", !strcmp("whee", owl_variable_get_string(var)));

variable.c

@@ -135 +135 @@
   OWLVAR_BOOL( "loginsubs" /* %OwlVarStub */, 1,
                "load logins from .anyone on startup", "" );
-
-  OWLVAR_ENUM( "loggingdirection" /* %OwlVarStub */, OWL_LOGGING_DIRECTION_BOTH,
-               "specifies which kind of messages should be logged",
-               "Can be one of 'both', 'in', or 'out'.  If 'in' is\n"
-               "selected, only incoming messages are logged, if 'out'\n"
-               "is selected only outgoing messages are logged.  If 'both'\n"
-               "is selected both incoming and outgoing messages are\n"
-               "logged.",
-               "both,in,out");
 
   OWLVAR_BOOL_FULL( "colorztext" /* %OwlVarStub */, 1,
@@ -184 +175 @@
                     "off,middle,on",
                     NULL, owl_variable_disable_ctrl_d_set, NULL);
-
-  OWLVAR_PATH( "logpath" /* %OwlVarStub */, "~/zlog/people",
-               "path for logging personal zephyrs", 
-               "Specifies a directory which must exist.\n"
-               "Files will be created in the directory for each sender.\n");
-
-  OWLVAR_PATH( "classlogpath" /* %OwlVarStub:classlogpath */, "~/zlog/class",
-               "path for logging class zephyrs",
-               "Specifies a directory which must exist.\n"
-               "Files will be created in the directory for each class.\n");
 
   OWLVAR_PATH( "debug_file" /* %OwlVarStub */, OWL_DEBUG_FILE,