Merge pull request #13 from gileadmcgee/master

enabled turning off feed scripts
xeroc · Oct 23, 2015 · 5e33608 · 5e33608
2 parents f8ceab1 + 0627c20
commit 5e33608
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/scripts/watcher/config-example.py b/scripts/watcher/config-example.py
@@ -22,3 +22,5 @@
 
 # the minute of each hour that you would like the feed script triggered.
 feed_script_time = 42
+
+feed_script_active = False
diff --git a/scripts/watcher/watcher.py b/scripts/watcher/watcher.py
@@ -12,7 +12,11 @@
 
 rpc = GrapheneWebsocket("localhost", 8092, "", "")
 
-
+def unlockWallet():
+    if config.feed_script_active = True:
+        print("unlocking wallet")
+        rpc.unlock(config.wallet_password)
+        time.sleep(10)
 
 def closeScreens():
     print("closing wallet")
@@ -54,19 +58,13 @@ def watch(tries):
         if tries > 2:
             closeScreens()
             resync()
-            print("unlocking wallet")
-            rpc.unlock(config.wallet_password)
-            print("wallet unlocked")
-            time.sleep(30)
+            unlockWallet()
             tries = 0
             return tries
         else:
             closeScreens()
             openScreens()
-            print("unlocking wallet")
-            rpc.unlock(config.wallet_password)
-            print("wallet unlocked")
-            time.sleep(30)
+            unlockWallet()
             tries += 1
             return tries
     else:
@@ -99,8 +97,7 @@ def checkTime():
 crash = 0
 closeScreens()
 openScreens()
-print("unlocking wallet")
-rpc.unlock(config.wallet_password)
+unlockWallet()
 
 
 
@@ -117,53 +114,44 @@ def checkTime():
                 crash = 0
                 closeScreens()
                 resync()
-                print("unlocking wallet")
-                rpc.unlock(config.wallet_password)
-                print("wallet unlocked")
+                unlockWallet()
             else:
                 crash += 1
                 print("error.  restarting.")
                 closeScreens()
                 openScreens()
-                print("unlocking wallet")
-                rpc.unlock(config.wallet_password)
-                print("wallet unlocked")
+                unlockWallet()
         except:
             try:
                 if crash > 2:
                     crash = 0
                     closeScreen()
                     resync()
-                    print("unlocking wallet")
-                    rpc.unlock(config.wallet_password)
+                    unlockWallet()
                 else:
                     crash += 1
                     print("error... restarting")
                     closeScreens()
                     openScreens()
-                    print("unlocking wallet")
-                    rpc.unlock(config.wallet_password)
+                    unlockWallet()
             except:
                 try:
                     if crash > 2:
                         crash = 0
                         closeScreens()
                         resync()
-                        print("unlocking wallet")
-                        rpc.unlock(config.wallet_password)
+                        unlockWallet()
                     else:
                         crash += 1
                         print("error.  restarting.")
                         closeScreens()
                         openScreens()
-                        print("unlocking wallet")
-                        rpc.unlock(config.wallet_password)
+                        unlockWallet()
                 except:
                     crash = 0
                     closeScreens()
                     resync()
-                    print("unlocking wallet")
-                    rpc.unlock(config.wallet_password)
+                    unlockWallet()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,5 @@

		# the minute of each hour that you would like the feed script triggered.
		feed_script_time = 42

		feed_script_active = False