Removed argconfparse dependency, better conf in yaml.

Author: raidoz

.gitignore

@@ -1 +1,4 @@
 *.pyc
+dist
+.idea
+simpledaemonlog.egg-info

requirements.txt

@@ -1,2 +1,2 @@
-argconfparse
 pyyaml
+colorlog

setup.py

@@ -4,19 +4,21 @@
 situations and has been made available for easy reuse with different daemons.
 """
 
-from setuptools import setup
+from setuptools import setup, find_packages
+
+import simpledaemonlog
 
 doclines = __doc__.split("\n")
 
 setup(name='simpledaemonlog',
-      version='0.1.0',
+      version=simpledaemonlog.version,
       description='Set up simple logging for a python daemon.',
       long_description='\n'.join(doclines[2:]),
       url='http://github.com/proactivity-lab/python-simpledaemonlog',
       author='Raido Pahtma',
       author_email='raido.pahtma@ttu.ee',
       license='MIT',
       platforms=["any"],
-      install_requires=["pyyaml", "argconfparse"],
-      packages=['simpledaemonlog'],
+      install_requires=["pyyaml", "colorlog"],
+      packages=find_packages(),
       zip_safe=False)

simpledaemonlog/__init__.py

@@ -0,0 +1,6 @@
+"""__init__.py: Module init."""
+
+from .logsetup import version
+
+__author__ = "Raido Pahtma"
+__license__ = "MIT"

simpledaemonlog/daemonarguments.py

@@ -1,13 +1,16 @@
-"""daemonarguments.py: Common options for daemons with argconfparse and simpledaemonlog."""
+"""daemonarguments.py: Common argparse options for daemons with simpledaemonlog."""
 
 from simpledaemonlog import logsetup
-from argconfparse.argconfparse import arg_str2bool
-
 
 __author__ = 'Raido Pahtma'
 __license__ = "MIT"
 
 
+def arg_str2bool(v):
+    """ Use this for boolean options, regular bool is always treated as True. """
+    return v.lower() in ("yes", "y", "true", "t", "1")
+
+
 def add_daemon_arguments(parser):
     parser.add_argument("--daemon", default=False, type=arg_str2bool, help="Daemon mode, no logging to console.")
     parser.add_argument("-d", dest="daemon", action="store_true", help="Daemon mode, no logging to console.")

simpledaemonlog/logsetup.py

@@ -14,6 +14,7 @@
 __author__ = 'Raido Pahtma'
 __license__ = "MIT"
 
+version = "0.2.0"
 
 DEFAULT_FORMAT_STRING = '%(asctime)s|%(levelname)8s|%(module)20s|%(lineno)4s| %(message)s'
 COLORED_FORMAT_STRING = '%(log_color)s%(asctime)s%(reset)s|%(module)20s|%(lineno)4s| %(log_color)s%(message)s'
@@ -77,7 +78,7 @@ def setup_console(level=logging.NOTSET, fs=DEFAULT_FORMAT_STRING, settings=None,
         formatter = logging.Formatter(fs)
 
     console.setFormatter(formatter)
-    console.setLevel(level)
+    console.setLevel(logging.NOTSET)
 
     rootlogger = logging.getLogger("")
     rootlogger.setLevel(min(level, rootlogger.getEffectiveLevel()))
@@ -102,17 +103,19 @@ def setup_file(application_name, logdir="log", level=logging.NOTSET, fs=DEFAULT_
     loglatest = "log_{}_latest.txt".format(application_name)
     logfilepath = os.path.join(logdir, logfilename)
     loglinkpath = os.path.join(logdir, loglatest)
-    logfile = logging.handlers.TimedRotatingFileHandler(logfilepath, when="W6", backupCount=backups)
-
-    if os.path.islink(loglinkpath):
-        os.unlink(loglinkpath)
+    if backups:
+        logfile = logging.handlers.TimedRotatingFileHandler(logfilepath, when="W6", backupCount=backups)
+    else:
+        logfile = logging.FileHandler(logfilepath)
 
     if hasattr(os, "symlink"):
+        if os.path.islink(loglinkpath):
+            os.unlink(loglinkpath)
         os.symlink(logfilename, loglinkpath)
 
     formatter = logging.Formatter(fs)
     logfile.setFormatter(formatter)
-    logfile.setLevel(level)
+    logfile.setLevel(logging.NOTSET)
 
     rootlogger = logging.getLogger("")
     rootlogger.setLevel(min(level, rootlogger.getEffectiveLevel()))