버그 수정

language/en-US.json

@@ -394,5 +394,6 @@
             "invalid_password_error" : "The Password or ID is invalid.",
             "watchlist_overflow_error": "You cannot add more than ten documents.",
             "copyright_disagreed" : "You have to agree copyright noticement to contribute",
-            "email_send_error" : "Email transfer failed."
+            "email_send_error" : "Email transfer failed.",
+            "restart_fail_error" : "Restart failed. Please use manual restart."
 }

language/ko-KR.json

@@ -370,5 +370,6 @@
     "empty" : "빈칸",
     "email_send_error" : "이메일 전송이 실패했습니다.",
     "get_sitemap" : "sitemap.xml 만들거나 갱신하기",
-    "same_ip_exist" : "동일한 아이피가 존재합니다."
+    "same_ip_exist" : "동일한 아이피가 존재합니다.",
+    "restart_fail_error" : "재시작이 실패했습니다. 수동 재시작을 이용해주세요."
 }

route/server_now_update.py

@@ -29,7 +29,7 @@ def server_now_update_2(conn, r_ver):
             if (ok[0] and ok[1] and ok[2] and ok[3]) == 0:
                 return redirect('/restart')
             else:
-                print('Update error')
+                print('Error : update failed')
         elif platform.system() == 'Windows':
             os.system('rd /s /q route')
             urllib.request.urlretrieve('https://github.com/2DU/opennamu/archive/' + up_data + '.zip', 'update.zip')
@@ -41,13 +41,9 @@ def server_now_update_2(conn, r_ver):
 
                 return redirect('/restart')
             else:
-                print('Update error')
+                print('Error : update failed')
 
-        return easy_minify(flask.render_template(skin_check(),
-            imp = [load_lang('update'), wiki_set(), custom(), other2([0, 0])],
-            data = load_lang("update_error") + ' <a href="https://github.com/2DU/opennamu">(Github)</a>',
-            menu = [['manager/1', load_lang('return')]]
-        ))
+        return re_error('/error/34')
     else:
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('update'), wiki_set(), custom(), other2([0, 0])],

route/server_restart.py

@@ -12,14 +12,20 @@ def server_restart_2(conn):
         print('----')
         print('Restart')
 
-        os.execl(sys.executable, '"' + sys.executable + '"', *sys.argv)
+        try:
+            os.execl(sys.executable, sys.executable, *sys.argv)
+        except:
+            try:
+                os.execl(sys.executable, '"' + sys.executable + '"', *sys.argv)
+            except:
+                return re_error('/error/33')
     else:
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('wiki_restart'), wiki_set(), custom(), other2([0, 0])],
-            data =  '''
-                    <form method="post">
-                        <button type="submit">''' + load_lang('restart') + '''</button>
-                    </form>
-                    ''',
+            data = '''
+                <form method="post">
+                    <button type="submit">''' + load_lang('restart') + '''</button>
+                </form>
+            ''',
             menu = [['manager', load_lang('return')]]
         ))

route/tool/func.py

@@ -40,8 +40,16 @@ for i in range(0, 2):
                 ok = os.system('python' + ('3' if platform.system() != 'Windows' else '') + ' -m pip install --user -r requirements.txt')
                 if ok == 0:
                     print('----')
-                    os.execl(sys.executable, '"' + sys.executable + '"', *sys.argv)
+                    try:
+                        os.execl(sys.executable, sys.executable, *sys.argv)
+                    except:
+                        try:
+                            os.execl(sys.executable, '"' + sys.executable + '"', *sys.argv)
+                        except:
+                            print('Error : restart failed')
+                            raise
                 else:
+                    print('Error : library install failed')
                     raise
             else:
                 print('----')
@@ -115,7 +123,7 @@ def send_email(who, title, data):
         return 1
     except Exception as e:
         print('----')
-        print('Error : Email send error')
+        print('Error : email send error')
         print(e)
 
         return 0
@@ -1284,6 +1292,10 @@ def re_error(data):
             data = load_lang('oauth_disabled')
         elif num == 32:
             data = load_lang('oauth_setting_not_found')
+        elif num == 33:
+            data = load_lang('restart_fail_error')
+        elif num == 34:
+            data = load_lang("update_error") + ' <a href="https://github.com/2DU/opennamu">(Github)</a>'
         else:
             data = '???'
 

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.9-master-26",
+        "r_ver" : "v3.1.9-master-27",
         "c_ver" : "3192100",
         "s_ver" : "9"
     }, "stable" : {