Merge branch 'release/0.1.1'

.bumpversion.cfg

@@ -1,5 +1,6 @@
 [bumpversion]
-current_version = 0.1.0
-files = setup.py src/clusterlogger/__init__.py docs/conf.py
+current_version = 0.1.1
+files = setup.py src/clusterlogger/__init__.py docs/source/conf.py
 commit = True
 tag = False
+

HISTORY.rst

@@ -7,3 +7,8 @@ History
 +++++++++++++++++++++++++++++++++++++++
 
 * First release on PyPI.
+
+0.1.1 (2015-07-18)
++++++++++++++++++++++++++++++++++++++++
+
+* Add ``sitename`` and ``platform`` attributes to the log record.

README.rst

@@ -36,5 +36,5 @@ Logging package for contextual information of clusters.
 Features
 --------
 
-* TODO
+* `Hazel Hen <http://www.hlrs.de/systems/platforms/cray-xc40-hazel-hen/>`_ logging filter.
 

docs/source/conf.py

@@ -33,8 +33,8 @@
 project = u'ClusterLogger'
 copyright = u'2015, David Zuber'
 
-version = '0.1.0'
-release = '0.1.0'
+version = '0.1.1'
+release = '0.1.1'
 
 exclude_patterns = ['_build']
 

setup.py

@@ -42,7 +42,7 @@ def run_tests(self):
 
 setup(
     name='clusterlogger',
-    version='0.1.0',
+    version='0.1.1',
     description='Logging package for contextual information of clusters.',
     long_description=long_description,
     author='David Zuber',

src/clusterlogger/__init__.py

@@ -6,4 +6,4 @@
 
 __author__ = 'David Zuber'
 __email__ = 'zuber.david@gmx.de'
-__version__ = '0.1.0'
+__version__ = '0.1.1'

src/clusterlogger/logfilter.py

@@ -31,6 +31,10 @@ def __init__(self):
         """The name of the queue from which the job is executed"""
         self.fqdn = socket.getfqdn()
         """The fully qualified domain name."""
+        self.sitename = os.environ.get('SITE_NAME')
+        """The site name of the cluster"""
+        self.platform = os.environ.get('SITE_PLATFORM_NAME')
+        """The cluster platform on the site. E.g. ``hazelhen``."""
 
     def filter(self, record):
         """Add contextual information to the log record
@@ -41,6 +45,8 @@ def filter(self, record):
         :rtype: :class:`bool`
         :raises: None
         """
+        record.sitename = self.sitename
+        record.platform = self.platform
         record.jobid = self.jobid
         record.submitter = self.logname
         record.jobname = self.jobname

test/test_logfilter.py

@@ -18,7 +18,9 @@ def hazelhen_environ(request):
     envvars = {'PBS_JOBID': '28572',
                'PBS_O_LOGNAME': 'hpcmscuser',
                'PBS_JOBNAME': 'loggingtest',
-               'PBS_QUEUE': 'test'}
+               'PBS_QUEUE': 'test',
+               'SITE_NAME': 'HLRS',
+               'SITE_PLATFORM_NAME': 'hazelhen'}
     oldvars = {}
     for k, v in envvars.items():
         oldvars[k] = os.environ.get(k, '')
@@ -33,7 +35,9 @@ def restore():
                          [('jobid', 'PBS_JOBID'),
                           ('submitter', 'PBS_O_LOGNAME'),
                           ('jobname', 'PBS_JOBNAME'),
-                          ('queue', 'PBS_QUEUE')])
+                          ('queue', 'PBS_QUEUE'),
+                          ('sitename', 'SITE_NAME'),
+                          ('platform', 'SITE_PLATFORM_NAME')])
 def test_hazelhen_filter_envvar(hazelhen_environ, attr, envvar):
     hhf = logfilter.HazelHenFilter()
     record = DummyRecord()