Merge pull request #222 from rattlehead12/master

Fix help options
yasinkuyu · Mar 27, 2018 · 50465f7 · 50465f7
2 parents b5710e7 + d760c52
commit 50465f7
Show file tree

Hide file tree

Showing 4 changed files with 255 additions and 144 deletions.
diff --git a/app/Messages.py b/app/Messages.py
@@ -5,5 +5,5 @@ class Messages():
 
     @staticmethod
     def get(msg):
-        print('m: ' + msg)
-        exit(1)
+        print('Message : ' + msg)
+        exit(1)
diff --git a/app/Orders.py b/app/Orders.py
@@ -65,7 +65,7 @@ def cancel_order(symbol, orderId):
             return True
 
         except Exception as e:
-            print('co: %s' % e)
+            print('cancel_order Exception: %s' % e)
             return False
 
     @staticmethod
@@ -79,7 +79,7 @@ def get_order_book(symbol):
             return lastBid, lastAsk
 
         except Exception as e:
-            print('ob: %s' % e)
+            print('get_order_book Exception: %s' % e)
             return 0, 0
 
     @staticmethod
@@ -89,13 +89,14 @@ def get_order(symbol, orderId):
             order = client.query_order(symbol, orderId)
 
             if 'msg' in order:
-                return False
+                #import ipdb; ipdb.set_trace()
                 Messages.get(order['msg']) # TODO
+                return False
 
             return order
 
         except Exception as e:
-            print('go: %s' % e)
+            print('get_order Exception: %s' % e)
             return False
 
     @staticmethod
@@ -110,7 +111,7 @@ def get_order_status(symbol, orderId):
             return order['status']
 
         except Exception as e:
-            print('gos: %s' % e)
+            print('get_order_status Exception: %s' % e)
             return None
 
     @staticmethod
@@ -121,7 +122,7 @@ def get_ticker(symbol):
 
             return float(ticker['lastPrice'])
         except Exception as e:
-            print('gt: %s' % e)
+            print('Get Ticker Exeption: %s' % e)
 
     @staticmethod
     def get_info(symbol):
@@ -135,4 +136,4 @@ def get_info(symbol):
             return info
 
         except Exception as e:
-            print('gi: %s' % e)
+            print('get_info Exception: %s' % e)