user can deploy without appid

dimens · Jan 9, 2016 · 407d8de · 407d8de
1 parent b03e096
commit 407d8de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/gae_proxy/local/direct_handler.py b/gae_proxy/local/direct_handler.py
@@ -23,6 +23,8 @@
 xlog = getLogger("gae_proxy")
 
 
+google_server_types = ["GAE", "Google Frontend", "GSE"]
+
 
 def send_header(wfile, keyword, value):
     keyword = keyword.title()
@@ -96,7 +98,8 @@ def handler(method, host, url, headers, body, wfile):
             if response:
                 if response.status > 400:
                     server_type = response.getheader('Server', "")
-                    if "gws" not in server_type and "Google Frontend" not in server_type and "GFE" not in server_type:
+
+                    if "gws" not in server_type and server_type not in google_server_types:
                         xlog.warn("IP:%s not support GAE, server type:%s status:%d", response.ssl_sock.ip, server_type, response.status)
                         google_ip.report_connect_fail(response.ssl_sock.ip, force_remove=True)
                         response.close()

diff --git a/gae_proxy/local/proxy.ini b/gae_proxy/local/proxy.ini
@@ -27,15 +27,15 @@ scholar.google.com.hk = direct
 ;mail.google.com = direct
 .commondatastorage.googleapis.com = gae
 chart.apis.google.com = gae
-appengine.google.com = gae
+appengine.google.com = direct
 ;mail-attachment.googleusercontent.com = direct
 ;.googleusercontent.com = direct
 ;themes.googleusercontent.com = direct
 talk.google.com = direct
 talk.l.google.com = direct
 talkx.l.google.com = direct
 ;.google.com = direct
-www.google.com = gae
+www.google.com = direct
 translate.google.com = gae
 ;.gmail.com = direct
 ;.ytimg.com = direct

diff --git a/gae_proxy/server/uploader.py b/gae_proxy/server/uploader.py
@@ -104,7 +104,7 @@ def upload(appid, email, password):
         fp.write(re.sub(r'application:\s*\S+', 'application: '+appid, yaml))
 
     try:
-        for i in range(100):
+        for i in range(3):
             try:
                 result = appcfg.AppCfgApp(['appcfg', 'rollback', dirname], password_input_fn=getpass_getpass, raw_input_fn = my_input, error_fh = my_stdout).Run()
                 if result != 0: