0000748: have Log4perl reload the log.conf config file each minute - PacketFence

# # old_revision [d495f2846778804f5bbe5fd9647de39dfb4aec76] # # patch "pf/lib/pf/WebAPI.pm" # from [71cea0df063d4a2c7aeaa2f14fd42fcf3b127e41] # to [82e6064ab5fee01e367bbc03be795e8185d9479e] # # patch "pf/sbin/pfdetect" # from [af89b91c74b82afad5bdadbc6b5209b1a74c3476] # to [add2c4d726e13910df49276a08ce9d1e164f2432] # # patch "pf/sbin/pfdhcplistener" # from [3613f4c25e8dca07738ba03070e018146ae5f540] # to [469311171a4d51241ddd0d72951774c16d3ab7c7] # # patch "pf/sbin/pfmon" # from [75af6cfee8308c452c6935d8a5916e7bfc72d986] # to [a896c3e84532d84214ad2e9ed4cf7a2d9da7fac4] # # patch "pf/sbin/pfredirect" # from [9d3cd0b2adb55bafa62c155c726a632becde71e2] # to [f5dff5e3c935228e32fdf42cd3511ee65e983008] # # patch "pf/sbin/pfsetvlan" # from [719d214cc8ef1392eebfec2aded025c4d06f551c] # to [ba345d6ffd9f5270401f550759d023dd19581548] # ============================================================ --- pf/sbin/pfdetect af89b91c74b82afad5bdadbc6b5209b1a74c3476 +++ pf/sbin/pfdetect add2c4d726e13910df49276a08ce9d1e164f2432 @@ -37,7 +37,7 @@ use pf::person; use pf::os; use pf::person; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", 60 ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', 0 ); ============================================================ --- pf/sbin/pfdhcplistener 3613f4c25e8dca07738ba03070e018146ae5f540 +++ pf/sbin/pfdhcplistener 469311171a4d51241ddd0d72951774c16d3ab7c7 @@ -43,7 +43,7 @@ use pf::violation; use pf::util; use pf::violation; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", 60 ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); # storing process id instead of thread id in tid (more useful) ============================================================ --- pf/sbin/pfmon 75af6cfee8308c452c6935d8a5916e7bfc72d986 +++ pf/sbin/pfmon a896c3e84532d84214ad2e9ed4cf7a2d9da7fac4 @@ -28,7 +28,7 @@ use lib INSTALL_DIR . "/lib"; use constant INSTALL_DIR => '/usr/local/pf'; use lib INSTALL_DIR . "/lib"; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", 60 ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', threads->self->tid() ); ============================================================ --- pf/sbin/pfredirect 9d3cd0b2adb55bafa62c155c726a632becde71e2 +++ pf/sbin/pfredirect f5dff5e3c935228e32fdf42cd3511ee65e983008 @@ -31,7 +31,7 @@ use pf::util; use pf::config; use pf::util; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", 60 ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', 0 ); ============================================================ --- pf/sbin/pfsetvlan 719d214cc8ef1392eebfec2aded025c4d06f551c +++ pf/sbin/pfsetvlan ba345d6ffd9f5270401f550759d023dd19581548 @@ -92,7 +92,7 @@ use pf::floatingdevice::custom; # }}}1 -Log::Log4perl->init( INSTALL_DIR . '/conf/log.conf' ); +Log::Log4perl->init_and_watch( INSTALL_DIR . '/conf/log.conf', 60 ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', threads->self->tid() ); ============================================================ --- pf/lib/pf/WebAPI.pm 71cea0df063d4a2c7aeaa2f14fd42fcf3b127e41 +++ pf/lib/pf/WebAPI.pm 82e6064ab5fee01e367bbc03be795e8185d9479e @@ -21,7 +21,7 @@ use SOAP::Transport::HTTP; #use SOAP::Lite +trace => [ fault => \&log_faults ]; use SOAP::Transport::HTTP; -Log::Log4perl->init_once("$conf_dir/log.conf"); +Log::Log4perl->init_and_watch("$conf_dir/log.conf",60); Log::Log4perl::MDC->put('proc', 'pf::WebAPI'); # set proper logger tid based on if we are run from mod_perl or not

# # old_revision [7d95979a7a190aeb208c1529f15daeaf5ac3e9a3] # # patch "pf/lib/pf/WebAPI.pm" # from [71cea0df063d4a2c7aeaa2f14fd42fcf3b127e41] # to [f70a7589b3b61bd4f4f54efa6204e439d2d68f20] # # patch "pf/lib/pf/config.pm" # from [1943fb3fc47059c19c217a2f7438bffeaef4de4a] # to [2ee812dc8838618fa083cd5e30a40df0d06b5106] # # patch "pf/sbin/pfdetect" # from [af89b91c74b82afad5bdadbc6b5209b1a74c3476] # to [d93d17bfc4e17c9adaf48d5c99c9a581f643c101] # # patch "pf/sbin/pfdhcplistener" # from [3613f4c25e8dca07738ba03070e018146ae5f540] # to [28589784ea3387f128b6f9c32e8220304e53c61f] # # patch "pf/sbin/pfmon" # from [75af6cfee8308c452c6935d8a5916e7bfc72d986] # to [11babb2d1a513e8e46b82249a4b6e4dd14864e46] # # patch "pf/sbin/pfredirect" # from [9d3cd0b2adb55bafa62c155c726a632becde71e2] # to [f4732742160ee3d54d59411ae8620b73b44bdb7e] # # patch "pf/sbin/pfsetvlan" # from [719d214cc8ef1392eebfec2aded025c4d06f551c] # to [0fe222b58a1e11e0305722fffeec39d437f4636d] # ============================================================ --- pf/sbin/pfdetect af89b91c74b82afad5bdadbc6b5209b1a74c3476 +++ pf/sbin/pfdetect d93d17bfc4e17c9adaf48d5c99c9a581f643c101 @@ -37,7 +37,7 @@ use pf::person; use pf::os; use pf::person; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", $LOG4PERL_RELOAD_TIMER ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', 0 ); ============================================================ --- pf/sbin/pfdhcplistener 3613f4c25e8dca07738ba03070e018146ae5f540 +++ pf/sbin/pfdhcplistener 28589784ea3387f128b6f9c32e8220304e53c61f @@ -43,7 +43,7 @@ use pf::violation; use pf::util; use pf::violation; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", $LOG4PERL_RELOAD_TIMER ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); # storing process id instead of thread id in tid (more useful) ============================================================ --- pf/sbin/pfmon 75af6cfee8308c452c6935d8a5916e7bfc72d986 +++ pf/sbin/pfmon 11babb2d1a513e8e46b82249a4b6e4dd14864e46 @@ -28,7 +28,7 @@ use lib INSTALL_DIR . "/lib"; use constant INSTALL_DIR => '/usr/local/pf'; use lib INSTALL_DIR . "/lib"; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", $LOG4PERL_RELOAD_TIMER ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', threads->self->tid() ); ============================================================ --- pf/sbin/pfredirect 9d3cd0b2adb55bafa62c155c726a632becde71e2 +++ pf/sbin/pfredirect f4732742160ee3d54d59411ae8620b73b44bdb7e @@ -31,7 +31,7 @@ use pf::util; use pf::config; use pf::util; -Log::Log4perl->init( INSTALL_DIR . "/conf/log.conf" ); +Log::Log4perl->init_and_watch( INSTALL_DIR . "/conf/log.conf", $LOG4PERL_RELOAD_TIMER ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', 0 ); ============================================================ --- pf/sbin/pfsetvlan 719d214cc8ef1392eebfec2aded025c4d06f551c +++ pf/sbin/pfsetvlan 0fe222b58a1e11e0305722fffeec39d437f4636d @@ -92,7 +92,7 @@ use pf::floatingdevice::custom; # }}}1 -Log::Log4perl->init( INSTALL_DIR . '/conf/log.conf' ); +Log::Log4perl->init_and_watch( INSTALL_DIR . '/conf/log.conf', $LOG4PERL_RELOAD_TIMER ); my $logger = Log::Log4perl->get_logger( basename($0) ); Log::Log4perl::MDC->put( 'proc', basename($0) ); Log::Log4perl::MDC->put( 'tid', threads->self->tid() ); ============================================================ --- pf/lib/pf/WebAPI.pm 71cea0df063d4a2c7aeaa2f14fd42fcf3b127e41 +++ pf/lib/pf/WebAPI.pm f70a7589b3b61bd4f4f54efa6204e439d2d68f20 @@ -21,7 +21,7 @@ use SOAP::Transport::HTTP; #use SOAP::Lite +trace => [ fault => \&log_faults ]; use SOAP::Transport::HTTP; -Log::Log4perl->init_once("$conf_dir/log.conf"); +Log::Log4perl->init_and_watch("$conf_dir/log.conf", $LOG4PERL_RELOAD_TIMER); Log::Log4perl::MDC->put('proc', 'pf::WebAPI'); # set proper logger tid based on if we are run from mod_perl or not ============================================================ --- pf/lib/pf/config.pm 1943fb3fc47059c19c217a2f7438bffeaef4de4a +++ pf/lib/pf/config.pm 2ee812dc8838618fa083cd5e30a40df0d06b5106 @@ -69,7 +69,7 @@ BEGIN { LOOPBACK_IPV4 %connection_type %connection_type_to_str %connection_type_explained $RADIUS_API_LEVEL $VLAN_API_LEVEL - %CAPTIVE_PORTAL + %CAPTIVE_PORTAL $LOG4PERL_RELOAD_TIMER ); } @@ -180,6 +180,9 @@ Readonly %CAPTIVE_PORTAL => ( "NET_DETECT_RETRY_DELAY" => 30, ); +# Log Reload Timer in seconds (default: 5min) +Readonly::Scalar our $LOG4PERL_RELOAD_TIMER => 300 + readPfConfigFiles(); readNetworkConfigFile();

Issue History
Date Modified	Username	Field	Change
2009-07-14 14:09	obilodeau	New Issue
2009-08-19 15:55	obilodeau	Status	new => assigned
2009-08-19 15:55	obilodeau	Assigned To	=> obilodeau
2010-05-05 09:57	obilodeau	Note Added: 0001546
2010-05-05 09:57	obilodeau	Category	future => feature
2010-05-05 09:57	obilodeau	Target Version	=> 1.9.0
2010-06-30 16:15	obilodeau	Note Added: 0001589
2010-06-30 16:15	obilodeau	Target Version	1.9.0 => 1.10.0
2010-11-19 14:25	obilodeau	Target Version	1.10.0 => 2.0.0
2011-01-18 09:30	obilodeau	Target Version	2.0.0 => 2.1.0
2011-03-03 15:16	obilodeau	Target Version	2.1.0 => +1
2011-03-03 15:18	obilodeau	Target Version	+1 => +2
2011-03-10 16:28	fgaudreault	Note Added: 0001914
2011-03-10 16:31	fgaudreault	File Added: log4perl.patch
2011-03-10 16:44	fgaudreault	File Deleted: log4perl.patch
2011-03-10 16:44	fgaudreault	File Added: log4perl.patch
2011-03-10 17:15	fgaudreault	Note Added: 0001915
2011-03-14 16:28	obilodeau	Assigned To	obilodeau => fgaudreault
2011-03-14 16:29	obilodeau	Note Added: 0001921
2011-03-17 14:34	fgaudreault	Note Added: 0001937
2011-03-17 14:35	fgaudreault	File Added: log4perl_v2.patch
2011-03-22 11:26	fgaudreault	Tag Attached: Code Review
2011-03-22 12:06	fgaudreault	Status	assigned => feedback
2011-05-02 18:42	obilodeau	mtn revision	=> ad71cbac120cc03d18ffa638666ce93631a8b6a9
2011-05-02 18:42	obilodeau	Note Added: 0002050
2011-05-02 18:42	obilodeau	Status	feedback => resolved
2011-05-02 18:42	obilodeau	Fixed in Version	=> trunk
2011-05-02 18:42	obilodeau	Resolution	open => fixed
2011-05-04 11:33	obilodeau	Fixed in Version	trunk => 2.2.0
2011-05-04 11:40	obilodeau	Status	resolved => closed
2011-10-25 09:05	obilodeau	Target Version	+2 => 2.2.0
2012-02-29 10:45	obilodeau	Category	feature => core

Notes
(0001546) obilodeau (reporter) 2010-05-05 09:57	well, in the daemons (pfsetvlan, pfmon, pfdetect, ...)

(0001589) obilodeau (reporter) 2010-06-30 16:15	re-targeted. because of potential impact. This should be done early in a cycle so we can release a snapshot with the feature activated, etc.

(0001914) fgaudreault (viewer) 2011-03-10 16:28	Please Test this patch. I changed the daemons init() to init_and_watch() with a 60sec timer.

(0001915) fgaudreault (viewer) 2011-03-10 17:15	Basic tests in dev were positive.

(0001921) obilodeau (reporter) 2011-03-14 16:29	patch needs to be re-worked: - extract magic 60 into a constant in pf::config - as discussed change default 60 to 60 * 5

(0001937) fgaudreault (viewer) 2011-03-17 14:34	Uploaded log4perl_v2 patch. It includes the proposed changes.

(0002050) obilodeau (reporter) 2011-05-02 18:42	fix committed in trunk. It needed modifications since pfmon wasn't building properly after the patch (relying on a pf::config parameter before pf::config was imported).

Relationships