bug fix

zjj2008se · Aug 26, 2013 · efd927c · efd927c
1 parent 5f761c2
commit efd927c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/bot.html b/bot.html
@@ -42,7 +42,7 @@
       };
       ws.onclose = function() {
         log.innerHTML += "<br /><span class=error>disconnected.</span>";
-        login(form);
+        setTimeout(function() { login(form); }, 60*1000);
       };
       ws.onmessage = function(event) {
         log.innerHTML += "<br />"+event.data;

diff --git a/bot.py b/bot.py
@@ -176,7 +176,7 @@ def explore(self):
 
     def run(self, login_id, password, area=None):
         self.login(login_id, password)
-        self.choose_area(int(area))
+        self.choose_area(area)
         while True:
             self._print('current AP:%s/%s BC:%s/%s' % (self.ma.ap, self.ma.ap_max, self.ma.bc, self.ma.bc_max))
             self.fairy()
@@ -189,7 +189,7 @@ def run(self, login_id, password, area=None):
     bot = Bot()
     while True:
         try:
-            bot.run(config.loginId, config.password, sys.argv[1] if len(sys.argv) > 1 else None)
+            bot.run(config.loginId, config.password, int(sys.argv[1]) if len(sys.argv) > 1 else None)
         except ma.HeaderError, e:
             print e.code, e.message, 'sleep for 10min'
             import traceback; traceback.print_exc()

diff --git a/web_bot.py b/web_bot.py
@@ -44,8 +44,8 @@ def websocket_app(environ, start_response):
     request = Request(environ)
     if request.path == '/bot' and 'wsgi.websocket' in environ:
         connected += 1
-        print "conn+%s=%d %s" % (environ.get('HTTP_X_Real_IP') or environ['REMOTE_ADDR'],
-                                 connected, environ['HTTP_USER_AGENT'])
+        print "conn+%s=%d %s" % (environ.get('HTTP_X_REAL_IP', environ['REMOTE_ADDR']),
+                                 connected, environ.get('HTTP_USER_AGENT', '-'))
         ws = environ["wsgi.websocket"]
         login_id = request.GET['id']
         password = request.GET['password']
@@ -58,10 +58,12 @@ def websocket_app(environ, start_response):
                 print "current conn-1: %d" % connected
                 break
             except ma.HeaderError, e:
+                print e.code, e.message
                 ws.send('%s %s %s' % (e.code, e.message, 'sleep for 10min'))
                 time.sleep(10*60)
                 continue
             except Exception, e:
+                import traceback; traceback.print_exc()
                 ws.send('%r %s' % (e, 'sleep for 1min'))
                 time.sleep(60)
                 continue