Changeset 611236e for perl/lib/BarnOwl/Message.pm

Timestamp:

Jan 7, 2014, 6:02:25 PM (9 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

2688bd5

Parents:

cc27237

git-author:

Jason Gross <jgross@mit.edu> (01/05/14 18:08:28)

git-committer:

Jason Gross <jgross@mit.edu> (01/07/14 18:02:25)

Message:

Add log-to-subdirectories, a compatibility frob

If disabled (the default), then logging of jabber and AIM messages
behaves how it used to.  If enabled, then each protocol gets its own
subdirectory.

File:

• perl/lib/BarnOwl/Message.pm (modified) (3 diffs)

perl/lib/BarnOwl/Message.pm

@@ -183 +183 @@
     }
     $filename = "unknown" if !defined($filename) || $filename eq '';
-    return ($filename);
+    if (BarnOwl::getvar('log-to-subdirectories') eq 'on') {
+        return ($filename);
+    } else {
+        return ($m->log_subfolder . ':' . $filename);
+    }
 }
 
@@ -205 +209 @@
 Returns the folder in which all messages of this class get logged.
 
-Defaults to C<log_base_path>/C<log_subfolder>.
+Defaults to C<log_base_path/log_subfolder> if C<log-to-subdirectories>
+is enabled, or to the C<logpath> BarnOwl variable if it is not.
+
+Most protocols should override C<log_subfolder> rather than
+C<log_path>, in order to properly take into account the value of
+C<log-to-subdirectories>.
 
 =cut
@@ -211 +220 @@
 sub log_path {
     my ($m) = @_;
-    return File::Spec->catfile($m->log_base_path, $m->log_subfolder);
+    if (BarnOwl::getvar('log-to-subdirectories') eq 'on') {
+        return File::Spec->catfile($m->log_base_path, $m->log_subfolder);
+    } else {
+        return BarnOwl::getvar('logpath');
+    }
 }