1.2.1, fix config bug.

Author: xxnet

README.md

@@ -1,5 +1,5 @@
 modules:
-  goagent: {auto_start: 1, current_version: 3.1.36, ignore_version: 3.1.36}
+  goagent: {auto_start: 1, current_version: 3.1.37, ignore_version: 3.1.37}
   launcher: {current_version: 1.0.4, ignore_version: 1.0.4}
 update: {check_update: 1, last_path: /, node_id: '0',
   uuid: 0}

data/launcher/config.yaml

@@ -84,7 +84,11 @@ def load(self):
         self.PROXY_ENABLE = self.CONFIG.getint('proxy', 'enable')
         self.PROXY_TYPE = self.CONFIG.get('proxy', 'type')
         self.PROXY_HOST = self.CONFIG.get('proxy', 'host')
-        self.PROXY_PORT = self.CONFIG.getint('proxy', 'port')
+        self.PROXY_PORT = self.CONFIG.get('proxy', 'port')
+        if self.PROXY_PORT == "":
+            self.PROXY_PORT = 0
+        else:
+            self.PROXY_PORT = int(self.PROXY_PORT)
         self.PROXY_USER = self.CONFIG.get('proxy', 'user')
         self.PROXY_PASSWD = self.CONFIG.get('proxy', 'passwd')
 
@@ -101,7 +105,7 @@ def info(self):
         if self.CONTROL_ENABLE:
             info += 'Control Address    : %s:%d\n' % (self.CONTROL_IP, self.CONTROL_PORT)
         if self.PROXY_ENABLE:
-            info += '%s Proxy    : %s:%d\n' % (self.PROXY_TYPE, self.PROXY_HOST, self.PROXY_PORT)
+            info += '%s Proxy    : %s:%s\n' % (self.PROXY_TYPE, self.PROXY_HOST, self.PROXY_PORT)
         info += 'Debug INFO         : %s\n' % self.LISTEN_DEBUGINFO if self.LISTEN_DEBUGINFO else ''
         info += 'GAE APPID          : %s\n' % '|'.join(self.GAE_APPIDS)
         if self.PAC_ENABLE:

goagent/3.1.36/web_ui/status.html~

@@ -51,7 +51,7 @@ class User_config(object):
     proxy_enable = "0"
     proxy_type = "HTTP"
     proxy_host = ""
-    proxy_port = "0"
+    proxy_port = ""
     proxy_user = ""
     proxy_passwd = ""
 

goagent/3.1.36/local/__init__.py renamed to goagent/3.1.37/local/__init__.py

@@ -34,7 +34,6 @@ <h2>配置GoAgent</h2>
 <script src="/js/jquery-1.11.2.min.js"></script>
 <script type="text/javascript">
     $.post( "http://127.0.0.1:8084/config?cmd=get_config", {}, function( data ) {
-        var data = JSON.parse(data);
         $( "#gae_appid" ).val(data.appid);
         $( "#gae_passwd" ).val(data.passwd);
         if(data.proxy_enable == 1){
@@ -69,9 +68,10 @@ <h2>配置GoAgent</h2>
         proxy_passwd = $("#proxy_passwd").val();
 
         $.post( "http://127.0.0.1:8084/config?cmd=set_config", {"appid":appid, "passwd": passwd,
-            "proxy_enable":proxy_enable, "proxy_type":proxy_type, "proxy_host":proxy_host, "proxy_port":proxy_port,
-             "proxy_user":proxy_user, "proxy_passwd":proxy_passwd,},
-        function( data ) {
+                "proxy_enable":proxy_enable, "proxy_type":proxy_type, "proxy_host":proxy_host, "proxy_port":proxy_port,
+                "proxy_user":proxy_user, "proxy_passwd":proxy_passwd,},
+            function( data ) {
+
             res = data.res
             if(res == "success") {
                 $("#status").html(res)