X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fclient.py;h=fe4869a8f9e4609d1224cc22f41b869409e5d708;hb=5b988dbe705784bf927915aa32d3a4aca0c1f308;hp=eccfee295668c2bb592401c2bbca9d885c1d49ce;hpb=341a97a11eb213bc706cdd445c9c85cb814100c3;p=osm%2Fosmclient.git

diff --git a/osmclient/client.py b/osmclient/client.py
index eccfee2..fe4869a 100644
--- a/osmclient/client.py
+++ b/osmclient/client.py
@@ -19,18 +19,40 @@
 OSM client entry point
 """
 
-from osmclient.v1 import client as client
 from osmclient.sol005 import client as sol005client
+import logging
+import verboselogs
 
+# pylint: disable=E1101
+verboselogs.install()
 
-def Client(version=1, host=None, sol005=True, *args, **kwargs):
-    if not sol005:
-        if version == 1:
-            return client.Client(host, *args, **kwargs)
-        else:
-            raise Exception("Unsupported client version")
+
+def Client(version=1, host=None, *args, **kwargs):
+    log_format_simple = "%(levelname)s %(message)s"
+    log_format_complete = "%(asctime)s %(levelname)s %(name)s %(filename)s:%(lineno)s %(funcName)s(): %(message)s"
+    log_formatter_simple = logging.Formatter(
+        log_format_simple, datefmt="%Y-%m-%dT%H:%M:%S"
+    )
+    handler = logging.StreamHandler()
+    handler.setFormatter(log_formatter_simple)
+    logger = logging.getLogger("osmclient")
+    logger.setLevel(level=logging.WARNING)
+    logger.addHandler(handler)
+    verbose = kwargs.get("verbose", 0)
+    if verbose > 0:
+        log_formatter = logging.Formatter(
+            log_format_complete, datefmt="%Y-%m-%dT%H:%M:%S"
+        )
+        # handler = logging.StreamHandler()
+        handler.setFormatter(log_formatter)
+        # logger.addHandler(handler)
+        if verbose == 1:
+            logger.setLevel(level=logging.INFO)
+        elif verbose == 2:
+            logger.setLevel(level=logging.VERBOSE)
+        elif verbose > 2:
+            logger.setLevel(level=logging.DEBUG)
+    if version == 1:
+        return sol005client.Client(host, *args, **kwargs)
     else:
-        if version == 1:
-            return sol005client.Client(host, *args, **kwargs)
-        else:
-            raise Exception("Unsupported client version")
+        raise Exception("Unsupported client version")