X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=main.py;h=13c22409188a34bd10138b308d766287ada0671b;hb=17fd3f752d5e37df906abddf1f13fd7ad1de6c00;hp=b68d5408a800ced65e9c29242fabb169e5d481ba;hpb=dcc1e201c17dd096fb757f973341e98865809f33;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/main.py b/main.py
index b68d540..13c2240 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 import configargparse
 import psycopg2
 import os
@@ -60,12 +59,15 @@ def make_order(market, value, currency, action="acquire",
     market.report.log_stage("make_order_end")
 
 def get_user_market(config_path, user_id, debug=False):
-    pg_config, report_path = parse_config(config_path)
+    args = ["--config", config_path]
+    if debug:
+        args.append("--debug")
+    args = parse_args(args)
+    pg_config = parse_config(args)
     market_id, market_config, user_id = list(fetch_markets(pg_config, str(user_id)))[0]
-    args = type('Args', (object,), { "debug": debug, "quiet": False })()
     return market.Market.from_config(market_config, args,
             pg_config=pg_config, market_id=market_id,
-            user_id=user_id, report_path=report_path)
+            user_id=user_id)
 
 def fetch_markets(pg_config, user):
     connection = psycopg2.connect(**pg_config)
@@ -93,13 +95,25 @@ def parse_config(args):
     del(args.db_password)
     del(args.db_database)
 
+    redis_config = {
+            "host": args.redis_host,
+            "port": args.redis_port,
+            "db": args.redis_database,
+            }
+    if redis_config["host"].startswith("/"):
+        redis_config["unix_socket_path"] = redis_config.pop("host")
+        del(redis_config["port"])
+    del(args.redis_host)
+    del(args.redis_port)
+    del(args.redis_database)
+
     report_path = args.report_path
 
     if report_path is not None and not \
             os.path.exists(report_path):
         os.makedirs(report_path)
 
-    return pg_config
+    return pg_config, redis_config
 
 def parse_args(argv):
     parser = configargparse.ArgumentParser(
@@ -132,6 +146,10 @@ def parse_args(argv):
             help="Store report to database (default)")
     parser.add_argument("--no-report-db", action='store_false', dest="report_db",
             help="Don't store report to database")
+    parser.add_argument("--report-redis", action='store_true', default=False, dest="report_redis",
+            help="Store report to redis")
+    parser.add_argument("--no-report-redis", action='store_false', dest="report_redis",
+            help="Don't store report to redis (default)")
     parser.add_argument("--report-path", required=False,
             help="Where to store the reports (default: absent, don't store)")
     parser.add_argument("--no-report-path", action='store_const', dest='report_path', const=None,
@@ -146,14 +164,24 @@ def parse_args(argv):
             help="Password access to database (default: cryptoportfolio)")
     parser.add_argument("--db-database", default="cryptoportfolio",
             help="Database access to database (default: cryptoportfolio)")
-
-    return parser.parse_args(argv)
-
-def process(market_config, market_id, user_id, args, pg_config):
+    parser.add_argument("--redis-host", default="localhost",
+            help="Host access to database (default: localhost). Use path for socket")
+    parser.add_argument("--redis-port", default=6379,
+            help="Port access to redis (default: 6379)")
+    parser.add_argument("--redis-database", default=0,
+            help="Redis database to use (default: 0)")
+
+    parsed = parser.parse_args(argv)
+    if parsed.action is None:
+        parsed.action = ["sell_all"]
+    return parsed
+
+def process(market_config, market_id, user_id, args, pg_config, redis_config):
     try:
         market.Market\
                 .from_config(market_config, args, market_id=market_id,
-                        pg_config=pg_config, user_id=user_id)\
+                        pg_config=pg_config, redis_config=redis_config,
+                        user_id=user_id)\
                 .process(args.action, before=args.before, after=args.after)
     except Exception as e:
         print("{}: {}".format(e.__class__.__name__, e))
@@ -161,19 +189,29 @@ def process(market_config, market_id, user_id, args, pg_config):
 def main(argv):
     args = parse_args(argv)
 
-    pg_config = parse_config(args)
+    pg_config, redis_config = parse_config(args)
+
+    market.Portfolio.report.set_verbose(not args.quiet)
 
     if args.parallel:
         import threading
         market.Portfolio.start_worker()
 
+        threads = []
         def process_(*args):
-            threading.Thread(target=process, args=args).start()
+            thread = threading.Thread(target=process, args=args)
+            thread.start()
+            threads.append(thread)
     else:
         process_ = process
 
     for market_id, market_config, user_id in fetch_markets(pg_config, args.user):
-        process_(market_config, market_id, user_id, args, pg_config)
+        process_(market_config, market_id, user_id, args, pg_config, redis_config)
+
+    if args.parallel:
+        for thread in threads:
+            thread.join()
+        market.Portfolio.stop_worker()
 
 if __name__ == '__main__': # pragma: no cover
     main(sys.argv[1:])