[ViewVC] Diff of: cvs/AnyEvent/lib/AnyEvent/Log.pm

Comparing AnyEvent/lib/AnyEvent/Log.pm (file contents):
Revision 1.29 by root, Thu Aug 25 00:14:32 2011 UTC vs.
Revision 1.41 by root, Thu Sep 1 04:07:18 2011 UTC

    AE::log debug => "hit my knee";
    AE::log warn  => "it's a bit too hot";
    AE::log error => "the flag was false!";
    AE::log fatal => "the bit toggled! run!"; # never returns
+   # available log levels in order:
+   # fatal alert critical error warn note info debug trace
 "Complex" uses (for speed sensitive code):
    use AnyEvent::Log;
    my $tracer = AnyEvent::Log::logger trace => \$my $trace;
    # send all critical and higher priority messages to syslog,
    # regardless of (most) other settings
    $AnyEvent::Log::COLLECT->attach (new AnyEvent::Log::Ctx
       level         => "critical",
-      log_to_syslog => 0,
+      log_to_syslog => "user",
    );
 =head1 DESCRIPTION
 This module implements a relatively simple "logging framework". It doesn't
 will be logged, unless you set C<PERL_ANYEVENT_VERBOSE> to a higher number
 before starting your program, or change the logging level at runtime with
 something like:
    use AnyEvent::Log;
-   AnyEvent::Log::FILTER->level ("info");
+   $AnyEvent::Log::FILTER->level ("info");
 The design goal behind this module was to keep it simple (and small),
 but make it powerful enough to be potentially useful for any module, and
 extensive enough for the most common tasks, such as logging to multiple
 targets, or being able to log into a database.
+The module is also usable before AnyEvent itself is initialised, in which
+case some of the functionality might be reduced.
-The amount of documentation might indicate otherwise, but the module is
+The amount of documentation might indicate otherwise, but the runtime part
-still just below 300 lines of code.
+of the module is still just below 300 lines of code.
 =head1 LOGGING LEVELS
 Logging levels in this module range from C<1> (highest priority) to C<9>
 (lowest priority). Note that the lowest numerical value is the highest
    8   debug
    9   trace
 As you can see, some logging levels have multiple aliases - the first one
 is the "official" name, the second one the "syslog" name (if it differs)
-and the third one the "perl" name, suggesting that you log C<die> messages
+and the third one the "perl" name, suggesting (only!) that you log C<die>
-at C<error> priority.
+messages at C<error> priority.
 You can normally only log a single message at highest priority level
 (C<1>, C<fatal>), because logging a fatal message will also quit the
 program - so use it sparingly :)
 use Carp ();
 use POSIX ();
 use AnyEvent (); BEGIN { AnyEvent::common_sense }
-use AnyEvent::Util ();
+#use AnyEvent::Util (); need to load this in a delayed fashion, as it uses AE::log
 our $VERSION = $AnyEvent::VERSION;
 our ($COLLECT, $FILTER, $LOG);
 =item AnyEvent::Log::log $level, $msg[, @args]
 Requests logging of the given C<$msg> with the given log level, and
 returns true if the message was logged I<somewhere>.
-For C<fatal> log levels, the program will abort.
+For loglevel C<fatal>, the program will abort.
 If only a C<$msg> is given, it is logged as-is. With extra C<@args>, the
 C<$msg> is interpreted as an sprintf format string.
 The C<$msg> should not end with C<\n>, but may if that is convenient for
    info     => 7,
    debug    => 8,
    trace    => 9,
 );
-sub now () { time }
+our $TIME_EXACT;
+sub exact_time($) {
+   $TIME_EXACT = shift;
+   *_ts = $AnyEvent::MODEL
+      ? $TIME_EXACT ? \&AE::now : \&AE::time
+      : sub () { $TIME_EXACT ? do { require Time::HiRes; Time::HiRes::time () } : time };
+}
+BEGIN {
+   exact_time 0;
+}
 AnyEvent::post_detect {
-   *now = \&AE::now;
+   exact_time $TIME_EXACT;
 };
 our @LEVEL2STR = qw(0 fatal alert crit error warn note info debug trace);
 # time, ctx, level, msg
                # now get raw message, unless we have it already
                unless ($now) {
                   $format = $format->() if ref $format;
                   $format = sprintf $format, @args if @args;
                   $format =~ s/\n$//;
-                  $now = AE::now;
+                  $now = _ts;
                };
                # format msg
                my $str = $ctx->[4]
                   ? $ctx->[4]($now, $_[0], $level, $format)
    $LOGGER{$logger+0} = $logger;
    _reassess $logger+0;
+   require AnyEvent::Util;
-   my $guard = AnyEvent::Util::guard {
+   my $guard = AnyEvent::Util::guard (sub {
       # "clean up"
       delete $LOGGER{$logger+0};
-   };
+   });
    sub {
       $guard if 0; # keep guard alive, but don't cause runtime overhead
       _log $ctx, $level, @_
 sub logger($;$) {
    _logger
       $CTX{ (caller)[0] } ||= _pkg_ctx +(caller)[0],
       @_
 }
+=item AnyEvent::Log::exact_time $on
+By default, C<AnyEvent::Log> will use C<AE::now>, i.e. the cached
+eventloop time, for the log timestamps. After calling this function with a
+true value it will instead resort to C<AE::time>, i.e. fetch the current
+time on each log message. This only makes a difference for event loops
+that actually cache the time (such as L<EV> or L<AnyEvent::Loop>).
+This setting can be changed at any time by calling this function.
+Since C<AnyEvent::Log> has to work even before the L<AnyEvent> has been
+initialised, this switch will also decide whether to use C<CORE::time> or
+C<Time::HiRes::time> when logging a message before L<AnyEvent> becomes
+available.
 =back
 =head1 LOGGING CONTEXTS
    }
    @$_ = ($_->[0], (1 << 10) - 1 - 1)
       for $LOG, $FILTER, $COLLECT;
-   $LOG->slaves;
+   #$LOG->slaves;
    $LOG->title ('$AnyEvent::Log::LOG');
    $LOG->log_to_warn;
    $FILTER->slaves ($LOG);
    $FILTER->title ('$AnyEvent::Log::FILTER');
 Needless(?) to say, if you do not want to be bitten by some evil person
 calling C<chdir>, the path should be absolute. Doesn't help with
 C<chroot>, but hey...
-=item $ctx->log_to_syslog ([$log_flags])
+=item $ctx->log_to_syslog ([$facility])
-Logs all messages via L<Sys::Syslog>, mapping C<trace> to C<debug> and all
+Logs all messages via L<Sys::Syslog>, mapping C<trace> to C<debug> and
-the others in the obvious way. If specified, then the C<$log_flags> are
+all the others in the obvious way. If specified, then the C<$facility> is
-simply or'ed onto the priority argument and can contain any C<LOG_xxx>
+used as the facility (C<user>, C<auth>, C<local0> and so on). The default
-flags valid for Sys::Syslog::syslog, except for the priority levels.
+facility is C<user>.
 Note that this function also sets a C<fmt_cb> - the logging part requires
 an array reference with [$level, $str] as input.
 =cut
       0
    });
 }
 sub log_to_syslog {
-   my ($ctx, $flags) = @_;
+   my ($ctx, $facility) = @_;
    require Sys::Syslog;
    $ctx->fmt_cb (sub {
       my $str = $_[3];
       $str =~ s/\n(?=.)/\n+ /g;
       [$_[2], "($_[1][0]) $str"]
    });
+   $facility ||= "user";
    $ctx->log_cb (sub {
       my $lvl = $_[0][0] < 9 ? $_[0][0] : 8;
-      Sys::Syslog::syslog ($flags | ($lvl - 1), $_)
+      Sys::Syslog::syslog ("$facility|" . ($lvl - 1), $_)
          for split /\n/, $_[0][1];
       0
    });
 }
    # enable debug log messages, log warnings and above to syslog
    filter=debug:log=+%warnings:%warnings=warn,syslog=LOG_LOCAL0
    # log trace messages (only) from AnyEvent::Debug to file
    AnyEvent::Debug=+%trace:%trace=only,trace,file=/tmp/tracelog
+A context name in the log specification can be any of the following:
+=over 4
+=item C<collect>, C<filter>, C<log>
+Correspond to the three predefined C<$AnyEvent::Log::COLLECT>,
+C<AnyEvent::Log::FILTER> and C<$AnyEvent::Log::LOG> contexts.
+=item C<%name>
+Context names starting with a C<%> are anonymous contexts created when the
+name is first mentioned. The difference to package contexts is that by
+default they have no attached slaves.
+=item a perl package name
+Any other string references the logging context associated with the given
+Perl C<package>. In the unlikely case where you want to specify a package
+context that matches on of the other context name forms, you can add a
+C<::> to the package name to force interpretation as a package.
+=back
+The configuration specifications can be any number of the following:
+=over 4
+=item C<stderr>
+Configures the context to use Perl's C<warn> function (which typically
+logs to C<STDERR>). Works like C<log_to_warn>.
+=item C<file=>I<path>
+Configures the context to log to a file with the given path. Works like
+C<log_to_file>.
+=item C<path=>I<path>
+Configures the context to log to a file with the given path. Works like
+C<log_to_path>.
+=item C<syslog> or C<syslog=>I<expr>
+Configures the context to log to syslog. If I<expr> is given, then it is
+evaluated in the L<Sys::Syslog> package, so you could use:
+   log=syslog=LOG_LOCAL0
+=item C<nolog>
+Configures the context to not log anything by itself, which is the
+default. Same as C<< $ctx->log_cb (undef) >>.
+=item C<0> or C<off>
+Sets the logging level of the context ot C<0>, i.e. all messages will be
+filtered out.
+=item C<all>
+Enables all logging levels, i.e. filtering will effectively be switched
+off (the default).
+=item C<only>
+Disables all logging levels, and changes the interpretation of following
+level specifications to enable the specified level only.
+Example: only enable debug messages for a context.
+   context=only,debug
+=item C<except>
+Enables all logging levels, and changes the interpretation of following
+level specifications to disable that level. Rarely used.
+Example: enable all logging levels except fatal and trace (this is rather
+nonsensical).
+   filter=exept,fatal,trace
+=item C<level>
+Enables all logging levels, and changes the interpretation of following
+level specifications to be "that level or any higher priority
+message". This is the default.
+Example: log anything at or above warn level.
+   filter=warn
+   # or, more verbose
+   filter=only,level,warn
+=item C<1>..C<9> or a logging level name (C<error>, C<debug> etc.)
+A numeric loglevel or the name of a loglevel will be interpreted according
+to the most recent C<only>, C<except> or C<level> directive. By default,
+specifying a logging level enables that and any higher priority messages.
+=item C<+>I<context>
+Attaches the named context as slave to the context.
+=item C<+>
+A line C<+> detaches all contexts, i.e. clears the slave list from the
+context. Anonymous (C<%name>) contexts have no attached slaves by default,
+but package contexts have the parent context as slave by default.
+Example: log messages from My::Module to a file, do not send them to the
+default log collector.
+   My::Module=+,file=/tmp/mymodulelog
+=back
+Any character can be escaped by prefixing it with a C<\> (backslash), as
+usual, so to log to a file containing a comma, colon, backslash and some
+spaces in the filename, you would do this:
+   PERL_ANYEVENT_LOG='log=file=/some\ \:file\ with\,\ \\-escapes'
 Since whitespace (which includes newlines) is allowed, it is fine to
 specify multiple lines in C<PERL_ANYEVENT_LOG>, e.g.:
    PERL_ANYEVENT_LOG="
       filter=warn
       AnyEvent::Debug=+%trace
       %trace=only,trace,+log
    " myprog
-A context name in the log specification can be any of the following:
+Also, in the unlikely case when you want to concatenate specifications,
+use whitespace as separator, as C<::> will be interpreted as part of a
+module name, an empty spec with two separators:
-=over 4
+   PERL_ANYEVENT_LOG="$PERL_ANYEVENT_LOG MyMod=debug"
-=item C<collect>, C<filter>, C<log>
-Correspond to the three predefined C<$AnyEvent::Log::COLLECT>,
-C<AnyEvent::Log::FILTER> and C<$AnyEvent::Log::LOG> contexts.
-=item C<%name>
-Context names starting with a C<%> are anonymous contexts created when the
-name is first mentioned. The difference to package contexts is that by
-default they have no attached slaves.
-=item a perl package name
-Any other string references the logging context associated with the given
-Perl C<package>. In the unlikely case where you want to specify a package
-context that matches on of the other context name forms, you can add a
-C<::> to the package name to force interpretation as a package.
-=back
-The configuration specifications can be any number of the following:
-=over 4
-=item C<stderr>
-Configures the context to use Perl's C<warn> function (which typically
-logs to C<STDERR>). Works like C<log_to_warn>.
-=item C<file=>I<path>
-Configures the context to log to a file with the given path. Works like
-C<log_to_file>.
-=item C<path=>I<path>
-Configures the context to log to a file with the given path. Works like
-C<log_to_path>.
-=item C<syslog> or C<syslog=>I<expr>
-Configured the context to log to syslog. If I<expr> is given, then it is
-evaluated in the L<Sys::Syslog> package, so you could use:
-   log=syslog=LOG_LOCAL0
-=item C<nolog>
-Configures the context to not log anything by itself, which is the
-default. Same as C<< $ctx->log_cb (undef) >>.
-=item C<0> or C<off>
-Sets the logging level of the context ot C<0>, i.e. all messages will be
-filtered out.
-=item C<all>
-Enables all logging levels, i.e. filtering will effectively be switched
-off (the default).
-=item C<only>
-Disables all logging levels, and changes the interpretation of following
-level specifications to enable the specified level only.
-Example: only enable debug messages for a context.
-   context=only,debug
-=item C<except>
-Enables all logging levels, and changes the interpretation of following
-level specifications to disable that level. Rarely used.
-Example: enable all logging levels except fatal and trace (this is rather
-nonsensical).
-   filter=exept,fatal,trace
-=item C<level>
-Enables all logging levels, and changes the interpretation of following
-level specifications to be "that level or any higher priority
-message". This is the default.
-Example: log anything at or above warn level.
-   filter=warn
-   # or, more verbose
-   filter=only,level,warn
-=item C<1>..C<9>, a logging level name (C<error>, C<debug> etc.)
-A numeric loglevel or the name of a loglevel will be interpreted according
-to the most recent C<only>, C<except> or C<level> directive. By default,
-specifying a logging level enables that and any higher priority messages.
-=item C<+>I<context>
-Adds/attaches the named context as slave to the context.
-=item C<+>
-A line C<+> clears the slave list form the context. Anonymous (C<%name>)
-contexts have no slaves by default, but package contexts have the parent
-context as slave by default.
-Example: log messages from My::Module to a file, do not send them to the
-default log collector.
-   My::Module=+,file=/tmp/mymodulelog
-=back
 =cut
 for (my $spec = $ENV{PERL_ANYEVENT_LOG}) {
    my %anon;
       while (/\G((?:[^,:[:space:]]+|::|\\.)+)/gc) {
          for ("$1") {
             if ($_ eq "stderr"               ) { $ctx->log_to_warn;
             } elsif (/^file=(.+)/            ) { $ctx->log_to_file ("$1");
             } elsif (/^path=(.+)/            ) { $ctx->log_to_path ("$1");
-            } elsif (/syslog(?:=(.*))?/      ) { require Sys::Syslog; $ctx->log_to_syslog (eval "package Sys::Syslog; $1");
+            } elsif (/syslog(?:=(.*))?/      ) { require Sys::Syslog; $ctx->log_to_syslog ($1);
             } elsif ($_ eq "nolog"           ) { $ctx->log_cb (undef);
             } elsif (/^\+(.+)$/              ) { $ctx->attach ($pkg->("$1"));
             } elsif ($_ eq "+"               ) { $ctx->slaves;
             } elsif ($_ eq "off" or $_ eq "0") { $ctx->level (0);
             } elsif ($_ eq "all"             ) { $ctx->level ("all");

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing AnyEvent/lib/AnyEvent/Log.pm (file contents): Revision 1.29 by root, Thu Aug 25 00:14:32 2011 UTC vs. Revision 1.41 by root, Thu Sep 1 04:07:18 2011 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent/Log.pm (file contents):
Revision 1.29 by root, Thu Aug 25 00:14:32 2011 UTC vs.
Revision 1.41 by root, Thu Sep 1 04:07:18 2011 UTC