composer-cli should not log to a file by default

The user can pass --log /path/to/logfile.log if they want logging
enabled.

(cherry picked from commit 844ff9998b)

src/bin/composer-cli

@@ -29,8 +29,12 @@ from composer.cli.cmdline import composer_cli_parser
 
 VERSION = "{0}-{1}".format(os.path.basename(sys.argv[0]), vernum)
 
-def setup_logging(logfile):
-    # Setup logging to console and to logfile
+def setup_logging(logfile=None):
+    """ Setup logging to console and to an optional logfile
+
+    :param logfile: Optional path to file to store logs in
+    :type logfile: None or str
+    """
     log.setLevel(logging.DEBUG)
 
     sh = logging.StreamHandler()
@@ -39,6 +43,7 @@ def setup_logging(logfile):
     sh.setFormatter(fmt)
     log.addHandler(sh)
 
+    if logfile != None:
         fh = logging.FileHandler(filename=logfile)
         fh.setLevel(logging.DEBUG)
         fmt = logging.Formatter("%(asctime)s %(levelname)s %(name)s: %(message)s")
@@ -54,6 +59,7 @@ if __name__ == '__main__':
         print(VERSION)
         sys.exit(0)
 
+    if opts.logfile != None:
         logpath = os.path.abspath(os.path.dirname(opts.logfile))
         if not os.path.isdir(logpath):
             os.makedirs(logpath)

src/composer/cli/cmdline.py

@@ -35,7 +35,7 @@ def composer_cli_parser():
                         help="Output the raw JSON response instead of the normal output.")
     parser.add_argument("-s", "--socket", default="/run/weldr/api.socket", metavar="SOCKET",
                         help="Path to the socket file to listen on")
-    parser.add_argument("--log", dest="logfile", default="./composer-cli.log", metavar="LOG",
+    parser.add_argument("--log", dest="logfile", default=None, metavar="LOG",
                         help="Path to logfile (./composer-cli.log)")
     parser.add_argument("-a", "--api", dest="api_version", default="0", metavar="APIVER",
                         help="API Version to use")