[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     d15762c4a6b15b3216c996ca43fba243374a3a9b
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Sep  6 17:21:19 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Sep  6 17:21:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d15762c4

recipe/easylogger: accept log formatter

for "initial" console logging

---
 roverlay/recipe/easylogger.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/roverlay/recipe/easylogger.py b/roverlay/recipe/easylogger.py
index c37f0cd..4ba2b46 100644
--- a/roverlay/recipe/easylogger.py
+++ b/roverlay/recipe/easylogger.py
@@ -39,9 +39,9 @@ def freeze_status():
    force_reset ( 10 )
 # --- end of freeze_status (...) ---
 
-def force_console_logging ( log_level=logging.DEBUG ):
+def force_console_logging ( log_level=logging.DEBUG, log_formatter=None ):
    force_reset()
-   setup_initial ( log_level=log_level )
+   setup_initial ( log_level=log_level, log_formatter=log_formatter )
    freeze_status()
 # --- end of force_console_logging (...) ---
 
@@ -50,15 +50,18 @@ def _zap_handlers():
       ROOT_LOGGER.removeHandler ( h )
 # --- end of _zap_handlers (...) ---
 
-def setup_initial_console ( log_level=logging.WARN ):
+def setup_initial_console ( log_level=logging.WARN, log_formatter=None ):
    ch = logging.StreamHandler ( stream=DEFAULT_STREAM )
    ch.setLevel ( log_level )
 
-   ch.setFormatter (
-      logging.Formatter (
-         fmt='%(levelname)-7s [%(name)s] %(message)s'
+   if log_formatter is None:
+      ch.setFormatter (
+         logging.Formatter (
+            fmt='%(levelname)-7s [%(name)s] %(message)s'
+         )
       )
-   )
+   else:
+      ch.setFormatter ( log_formatter )
 
    ROOT_LOGGER.addHandler ( ch )
    ROOT_LOGGER.setLevel ( ch.level )
@@ -198,7 +201,7 @@ def setup ( conf ):
 
    _STATUS = 2
 
-def setup_initial ( log_level=None ):
+def setup_initial ( log_level=None, log_formatter=None ):
    global _STATUS
    if _STATUS > 0:
       return
@@ -207,8 +210,10 @@ def setup_initial ( log_level=None ):
    logging.lastResort      = None
    logging.raiseExceptions = True
    if log_level is None:
-      setup_initial_console()
+      setup_initial_console ( log_formatter=log_formatter )
    else:
-      setup_initial_console ( log_level=log_level )
+      setup_initial_console (
+         log_level=log_level, log_formatter=log_formatter
+      )
 
    _STATUS = 1

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     97ddb120f071669bb1322de558b80dce7d086e66
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Feb 21 18:22:28 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Feb 21 18:22:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=97ddb120

roverlay/, logging: rotate log files by default

change some logging defaults:
LOG_FILE_ROTATE: false -> true
LOG_FILE_ROTATE_COUNT: 3 -> 5

---
 roverlay/recipe/easylogger.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roverlay/recipe/easylogger.py b/roverlay/recipe/easylogger.py
index 2b6281b..a782eec 100644
--- a/roverlay/recipe/easylogger.py
+++ b/roverlay/recipe/easylogger.py
@@ -129,7 +129,7 @@ def setup_file ( conf ):
    logfile = conf.get ( 'LOG.FILE.file' )
    if not logfile or not conf.get ( 'LOG.FILE.enabled', True ): return
 
-   rotating = conf.get ( 'LOG.FILE.rotate', False )
+   rotating = conf.get ( 'LOG.FILE.rotate', True )
 
    logdir = os.path.dirname ( logfile )
    if not os.path.isdir ( logdir ):
@@ -151,7 +151,7 @@ def setup_file ( conf ):
 
       fh = logging.handlers.RotatingFileHandler (
          logfile,
-         backupCount=conf.get ( 'LOG.FILE.rotate_count', 3 )
+         backupCount=conf.get ( 'LOG.FILE.rotate_count', 5 )
       )
       if rotate_now:
          fh.doRollover()

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     7a80bfc20a4d08da340101f60624301c47f8b527
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Feb 15 20:10:30 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Feb 15 20:10:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7a80bfc2

roverlay, logging: don't rotate empty log files

---
 roverlay/recipe/easylogger.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/roverlay/recipe/easylogger.py b/roverlay/recipe/easylogger.py
index d09028f..2b6281b 100644
--- a/roverlay/recipe/easylogger.py
+++ b/roverlay/recipe/easylogger.py
@@ -10,6 +10,7 @@ __all__ = [ 'setup', 'setup_console', 'setup_file', 'setup_initial',
    'setup_initial_console', 'setup_syslog'
 ]
 
+#import errno
 import sys
 import logging
 import logging.handlers
@@ -137,8 +138,17 @@ def setup_file ( conf ):
    if rotating:
       # using per-run log files
 
-      # rotate after handler creation if log file already exists
-      rotate_now = os.path.exists ( logfile )
+      # rotate after handler creation if log file exists and is not empty
+      try:
+         statinfo = os.stat ( logfile )
+      except OSError:
+         # log file does not exist
+         #  (probably, could check oserr.errno == errno.ENOENT)
+         rotate_now = False
+      else:
+         rotate_now = ( statinfo.st_size > 0 )
+         del statinfo
+
       fh = logging.handlers.RotatingFileHandler (
          logfile,
          backupCount=conf.get ( 'LOG.FILE.rotate_count', 3 )

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     2d4e28153224957abf52b5d56f1b68eb0804a288
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Nov  9 21:00:03 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Nov  9 21:00:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2d4e2815

roverlay/recipe/easylogger: fix setup_file()

Setting LOG_FILE_ENABLED=n has/had no effect when LOG_FILE is set.
This commit fixes that.

---
 roverlay/recipe/easylogger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roverlay/recipe/easylogger.py b/roverlay/recipe/easylogger.py
index 4ba2b46..d09028f 100644
--- a/roverlay/recipe/easylogger.py
+++ b/roverlay/recipe/easylogger.py
@@ -126,7 +126,7 @@ def setup_syslog ( conf ):
 
 def setup_file ( conf ):
    logfile = conf.get ( 'LOG.FILE.file' )
-   if not logfile or not ( 'LOG.FILE.enabled', True ): return
+   if not logfile or not conf.get ( 'LOG.FILE.enabled', True ): return
 
    rotating = conf.get ( 'LOG.FILE.rotate', False )
 

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     209f3507f6e0add9dd728f544f46a83006b65213
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 24 09:46:52 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 24 09:46:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=209f3507

roverlay/recipe/easylogger: force-set status

force_reset(), freeze_status(): set setup status
setup_initial*(): accept console log level (optional, as keyword)

---
 roverlay/recipe/easylogger.py | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/roverlay/recipe/easylogger.py b/roverlay/recipe/easylogger.py
index 5f7ee32..63b0209 100644
--- a/roverlay/recipe/easylogger.py
+++ b/roverlay/recipe/easylogger.py
@@ -22,14 +22,32 @@ ROOT_LOGGER = logging.getLogger()
 DEFAULT_DATE_FORMAT = '%F %H:%M:%S'
 DEFAULT_STREAM = sys.stdout
 
+def force_reset ( forced_status=None ):
+   """Enforces the given setup status (or 0). Use with care!
+
+   arguments:
+   * forced_status --
+   """
+   global _STATUS
+   _STATUS = int ( forced_status or 0 )
+# --- end of force_reset (...) ---
+
+def freeze_status():
+   """Enforces a setup status that prevents any subsequent setup*() call.
+   Use with care!
+   """
+   force_reset ( 10 )
+# --- end of freeze_status (...) ---
+
+
 def _zap_handlers():
    for h in ROOT_LOGGER.handlers:
       ROOT_LOGGER.removeHandler ( h )
 # --- end of _zap_handlers (...) ---
 
-def setup_initial_console():
+def setup_initial_console ( log_level=logging.WARN ):
    ch = logging.StreamHandler ( stream=DEFAULT_STREAM )
-   ch.setLevel ( logging.WARN )
+   ch.setLevel ( log_level )
 
    ch.setFormatter (
       logging.Formatter (
@@ -38,7 +56,7 @@ def setup_initial_console():
    )
 
    ROOT_LOGGER.addHandler ( ch )
-   ROOT_LOGGER.setLevel ( logging.WARN )
+   ROOT_LOGGER.setLevel ( ch.level )
 # --- end of setup_initial_console (...) ---
 
 def setup_console ( conf ):
@@ -175,7 +193,7 @@ def setup ( conf ):
 
    _STATUS = 2
 
-def setup_initial():
+def setup_initial ( log_level=None ):
    global _STATUS
    if _STATUS > 0:
       return
@@ -183,6 +201,9 @@ def setup_initial():
    _zap_handlers()
    logging.lastResort      = None
    logging.raiseExceptions = True
-   setup_initial_console()
+   if log_level is None:
+      setup_initial_console()
+   else:
+      setup_initial_console ( log_level=log_level )
 
    _STATUS = 1

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     883774e591e715f835e15f8c1421792984d2920c
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 11 11:23:16 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 11 11:23:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=883774e5

recipe/easylogger: set MemoryHandler log level

Setting LOG_FILE_BUFFERED=y should not set the log file level to debug.

---
 roverlay/recipe/easylogger.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roverlay/recipe/easylogger.py b/roverlay/recipe/easylogger.py
index f66bf1a..5f7ee32 100644
--- a/roverlay/recipe/easylogger.py
+++ b/roverlay/recipe/easylogger.py
@@ -146,6 +146,7 @@ def setup_file ( conf ):
          conf.get ( 'LOG.FILE.buffer_capacity', 250 ), # reasonable value?
          target=fh
       )
+      handler.setLevel ( fh.level )
    else:
       handler = fh
 

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     5a8f2a07655db3a15af5c82d4d8fffd14c7582d8
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul  6 22:12:07 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul  6 22:12:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5a8f2a07

make listener modules and dep rule pools optional

	modified:   roverlay/recipe/easyresolver.py

---
 roverlay/recipe/easyresolver.py |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/roverlay/recipe/easyresolver.py b/roverlay/recipe/easyresolver.py
index c083bda..e510181 100644
--- a/roverlay/recipe/easyresolver.py
+++ b/roverlay/recipe/easyresolver.py
@@ -12,19 +12,20 @@ def setup():
 
 	srule_pool = SimpleDependencyRulePool ( 'default pool', priority=45 )
 
-	srule_files = config.get_or_fail ( 'DEPRES.simple_rules.files' )
+	srule_files = config.get ( 'DEPRES.simple_rules.files', None )
 
-	unres_listener = listeners.UnresolvableSetFileListener (
-		config.get_or_fail ( 'LOG.FILE.unresolvable' )
-	)
+	if srule_files:
+		if isinstance ( srule_files, str ):
+			srule_pool.load_rule_file ( srule_files )
+		else:
+			for f in srule_files:
+				srule_pool.load_rule_file ( f )
 
-	if isinstance ( srule_files, str ):
-		srule_pool.load_rule_file ( srule_files )
-	else:
-		for f in srule_files:
-			srule_pool.load_rule_file ( f )
+		res.add_rulepool ( srule_pool )
 
-	res.add_rulepool ( srule_pool )
-	res.add_listener ( unres_listener )
+	unres_file = config.get ( 'LOG.FILE.unresolvable', None )
+	if unres_file:
+		unres_listener = listeners.UnresolvableSetFileListener ( unres_file )
+		res.add_listener ( unres_listener )
 	return res
 # --- end of setup (...) ---

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     f4677f4e6be4007c5cfffd8cdd2563f276b24721
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul  5 15:52:38 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul  5 15:52:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f4677f4e

recipe/easylogger: configurable logging

* log to disk using a FileHandler/RotatingFileHandler,
  optionally attached to a MemoryHandler
* log to syslog (code is incomplete and disabled)
* log to console (either stderr or stdout)

	modified:   roverlay/recipe/easylogger.py

---
 roverlay/recipe/easylogger.py |  167 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 152 insertions(+), 15 deletions(-)

diff --git a/roverlay/recipe/easylogger.py b/roverlay/recipe/easylogger.py
index 112d07b..411397d 100644
--- a/roverlay/recipe/easylogger.py
+++ b/roverlay/recipe/easylogger.py
@@ -2,30 +2,164 @@
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+import sys
 import logging
+import logging.handlers
+import os.path
 
 _STATUS = 0
 
+ROOT_LOGGER = logging.getLogger()
+
+DEFAULT_DATE_FORMAT = '%F %H:%M:%S'
+DEFAULT_STREAM = sys.stdout
+
+def _zap_handlers():
+	for h in ROOT_LOGGER.handlers:
+		ROOT_LOGGER.removeHandler ( h )
+# --- end of _zap_handlers (...) ---
+
+def setup_initial_console():
+	ch = logging.StreamHandler ( stream=DEFAULT_STREAM )
+	ch.setLevel ( logging.WARN )
+
+	ch.setFormatter (
+		logging.Formatter (
+			fmt='%(levelname)-7s [%(name)s] %(message)s'
+		)
+	)
+
+	ROOT_LOGGER.addHandler ( ch )
+	ROOT_LOGGER.setLevel ( logging.WARN )
+# --- end of setup_initial_console (...) ---
+
+def setup_console ( conf ):
+	if not conf.get ( 'LOG.CONSOLE.enabled', False ): return
+	stream = conf.get ( 'LOG.CONSOLE.stream', None )
+
+	if stream is not None:
+		if stream == 'stderr':
+			stream = sys.stderr
+		elif stream == 'stdout':
+			stream = sys.stdout
+		else:
+			stream = None
+
+	ch = logging.StreamHandler (
+		stream=DEFAULT_STREAM if stream is None else stream
+	)
+
+	ch.setLevel (
+		conf.get (
+			'LOG.CONSOLE.level',
+			conf.get ( 'LOG.level', logging.INFO )
+		)
+	)
+
+	ch_fmt = logging.Formatter (
+		fmt=conf.get (
+			'LOG.CONSOLE.format',
+			'%(levelname)-8s %(name)-14s: %(message)s'
+		),
+		datefmt=conf.get ( 'LOG.date_format', DEFAULT_DATE_FORMAT )
+	)
+
+	ch.setFormatter ( ch_fmt )
+
+	ROOT_LOGGER.addHandler ( ch )
+# --- end of setup_console (...) ---
+
+def setup_syslog ( conf ):
+#	if not conf.get ( 'LOG.SYSLOG.enabled', False ): return
+#
+#	lh = logging.handlers.SysLogHandler()
+#
+#	lh.setLevel (
+#		conf.get (
+#			'LOG.SYSLOG.level',
+#			conf.get ( 'LOG.level', logging.CRITICAL )
+#		)
+#	)
+#
+#	lh_fmt = I_DONT_KNOW
+#
+#	lh.setFormatter ( lh_fmt )
+#
+#	ROOT_LOGGER.addHandler ( lh )
+#
+	pass
+# --- end of setup_syslog (...) ---
+
+def setup_file ( conf ):
+	logfile = conf.get ( 'LOG.FILE.file' )
+	if not logfile or not ( 'LOG.FILE.enabled', True ): return
+
+	# FIXME explain this in config (and make it available)
+	rotating = conf.get ( 'LOG.FILE.rotate', False )
+
+	if rotating:
+		# using per-run log files
+
+		# rotate after handler creation if log file already exists
+		rotate_now = os.path.exists ( logfile )
+		fh = logging.handlers.RotatingFileHandler (
+			logfile,
+			backupCount=conf.get ( 'LOG.FILE.rotate_count', 3 )
+		)
+		if rotate_now:
+			fh.doRollover()
+		del rotate_now
+	else:
+		# using a big log file
+		fh = logging.FileHandler ( logfile )
+
+	fh.setLevel (
+		conf.get (
+			'LOG.FILE.level',
+			conf.get ( 'LOG.level', logging.WARN )
+		)
+	)
+
+	fh_fmt = logging.Formatter (
+		fmt=conf.get (
+			'LOG.FILE.format',
+			'%(asctime)s %(levelname)-8s %(name)-10s: %(message)s'
+		),
+		datefmt=conf.get ( 'LOG.date_format', DEFAULT_DATE_FORMAT )
+	)
+
+	fh.setFormatter ( fh_fmt )
+
+	if conf.get ( 'LOG.FILE.buffered', True ):
+		handler = logging.handlers.MemoryHandler (
+			conf.get ( 'LOG.FILE.buffer_capacity', 250 ), # reasonable value?
+			target=fh
+		)
+	else:
+		handler = fh
+
+	ROOT_LOGGER.addHandler ( handler )
+# --- end of setup_file (...) ---
+
+
 def setup ( conf ):
 	global _STATUS
 	if _STATUS > 1:
 		return
 
-	logging.basicConfig (
-		level=logging.DEBUG,
-		filename=conf.get ( [ 'LOG', 'FILE', 'main' ], 'roverlay.log' ),
-		filemode='a',
-		format='%(asctime)s %(levelname)-8s %(name)-14s -- %(message)s',
-		datefmt='%F %H:%M:%S'
-	)
+	_zap_handlers()
 
-	# add console output to the logger
-	ch = logging.StreamHandler()
-	ch.setLevel ( logging.DEBUG )
-	ch.setFormatter (
-		logging.Formatter  ( '%(levelname)-8s %(name)-14s -- %(message)s' )
-	)
-	logging.getLogger().addHandler ( ch )
+	if conf.get ( 'LOG.enabled', True ):
+		setup_console ( conf )
+		setup_file ( conf )
+		#setup_syslog ( conf )
+
+
+	if not ROOT_LOGGER.handlers:
+		# logging is disabled, add a nop handler
+		ROOT_LOGGER.addHandler ( logging.NullHandler() )
+
+	ROOT_LOGGER.setLevel ( min ( h.level for h in ROOT_LOGGER.handlers ) )
 
 	_STATUS = 2
 
@@ -34,6 +168,9 @@ def setup_initial():
 	if _STATUS > 0:
 		return
 
-	pass
+	_zap_handlers()
+	logging.lastResort      = None
+	logging.raiseExceptions = True
+	setup_initial_console()
 
 	_STATUS = 1

[gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/

[André Erdmann]

commit:     b3b84d70211dd20e7efb500365e4f78dae205c5b
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 27 14:44:51 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 27 14:44:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b3b84d70

add unresolvable listener to easyresolver

	modified:   roverlay/recipe/easyresolver.py

---
 roverlay/recipe/easyresolver.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/roverlay/recipe/easyresolver.py b/roverlay/recipe/easyresolver.py
index c5e737a..c083bda 100644
--- a/roverlay/recipe/easyresolver.py
+++ b/roverlay/recipe/easyresolver.py
@@ -14,6 +14,10 @@ def setup():
 
 	srule_files = config.get_or_fail ( 'DEPRES.simple_rules.files' )
 
+	unres_listener = listeners.UnresolvableSetFileListener (
+		config.get_or_fail ( 'LOG.FILE.unresolvable' )
+	)
+
 	if isinstance ( srule_files, str ):
 		srule_pool.load_rule_file ( srule_files )
 	else:
@@ -21,5 +25,6 @@ def setup():
 			srule_pool.load_rule_file ( f )
 
 	res.add_rulepool ( srule_pool )
+	res.add_listener ( unres_listener )
 	return res
 # --- end of setup (...) ---