<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>src/log.py</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -24,6 +24,7 @@ from os import environ, path
 import os
 from config import Config
 import re
+from log import log, setup_logging
 
 def _set_option(options, parser, key, value):
     defval = None
@@ -42,7 +43,6 @@ class CliCommand(object):
 
     def __init__(self, name=&quot;cli&quot;, usage=None, shortdesc=None,
             description=None):
-
         self.shortdesc = shortdesc
         if shortdesc is not None and description is None:
             description = shortdesc
@@ -65,6 +65,11 @@ class CliCommand(object):
                 metavar=&quot;PASSWORD&quot;, help=&quot;smugmug.com password&quot;)
         self.parser.add_option(&quot;--quiet&quot;, dest=&quot;quiet&quot;,
                 action=&quot;store_true&quot;, help=&quot;Don't tell us what you are doing&quot;)
+        self.parser.add_option(&quot;--log&quot;, dest=&quot;log_file&quot;, metavar=&quot;FILENAME&quot;,
+                help=&quot;log file name (will be overwritten)&quot;)
+        self.parser.add_option(&quot;--log-level&quot;, dest=&quot;log_level&quot;,
+                default=&quot;critical&quot;, metavar=&quot;LEvEL&quot;,
+                help=&quot;log level (debug/info/warning/error/critical)&quot;)
 
     def _validate_options(self):
         pass
@@ -78,6 +83,10 @@ class CliCommand(object):
     def main(self):
         (self.options, self.args) = self.parser.parse_args()
 
+        # Setup logging, this must happen early!
+        setup_logging(self.options.log_file, self.options.log_level)
+        log.debug(&quot;Running cli commands: %s&quot; % self.name)
+
         self._load_defaults_from_rc(self.options)
 
         self._validate_options()</diff>
      <filename>src/smcommands.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bda2524e76f719836d87def8f63e699d64ed709f</id>
    </parent>
  </parents>
  <author>
    <name>jesus m rodriguez</name>
    <email>jesusr@redhat.com</email>
  </author>
  <url>http://github.com/jmrodri/sm-photo-tool/commit/7ada657df01bc4787293451840a5e14567346b6c</url>
  <id>7ada657df01bc4787293451840a5e14567346b6c</id>
  <committed-date>2009-10-30T18:25:49-07:00</committed-date>
  <authored-date>2009-10-30T18:25:49-07:00</authored-date>
  <message>added log file support</message>
  <tree>ea15f6e46fcd48765e54ad0224905ba71004663d</tree>
  <committer>
    <name>jesus m rodriguez</name>
    <email>jesusr@redhat.com</email>
  </committer>
</commit>
