Changeset 3272

Timestamp:

01/26/12 21:06:56 (4 months ago)

Author:

erkn

Message:

Refactor logging and change formatting

Location:

branches/mcxtrace-1.0/src/mcrun2

Files:

• main.py (modified) (1 diff)
• mcstas.py (modified) (3 diffs)

branches/mcxtrace-1.0/src/mcrun2/main.py

@@ -178 +178 @@
 
     # Setup logging
-    formatter = logging.Formatter('%(asctime)s - %(message)s')
+    formatter = logging.Formatter('%(created)s, %(levelname)8s: %(message)s')
 
     handler = logging.StreamHandler()

branches/mcxtrace-1.0/src/mcrun2/mcstas.py

@@ -48 +48 @@
 
         # Run executable
-        LOG.debug('CMD: %s %s' % (self.executable, args))
+        LOG.debug('CMD: %s %s', self.executable, args)
         fid = Popen([self.executable] + args,
                     stdout=pipe,
@@ -93 +93 @@
         if not options.force_compile and isfile(self.binpath) \
                and modified(self.path) < modified(self.binpath):
-            LOG.info('Using existing binary: %s' % self.binpath)
+            LOG.info('Using existing binary: %s', self.binpath)
             return  # skip
-        LOG.info('Recompiling: %s' % self.binpath)
+        LOG.info('Recompiling: %s', self.binpath)
 
         # Generate C-code
@@ -139 +139 @@
         # Run McStas
         if not mpi:
-            LOG.info('Running: %s' % self.binpath)
+            LOG.info('Running: %s', self.binpath)
             Process(self.binpath).run(args, pipe=pipe)
         else:
-            LOG.info('Running via MPI: %s' % self.binpath)
+            LOG.info('Running via MPI: %s', self.binpath)
             mpi_args = ['-np', str(options.mpi), self.binpath]
             mpi_args += args