fix rights secret key, add socket.error exception handling

core/server/bootstrap.py

@@ -177,10 +177,13 @@ def create_request(server_cert, cert_path, data_path, certbase, \
     except KeyError, e:
         print e
         return None
-    for files in [key, client_req_file, key+'_pub']:
+    for files in [client_req_file, key+'_pub']:
         if os.path.exists(files):
             os.chown(files,pwdObj.pw_uid,pwdObj.pw_gid)
             os.chmod(files, 0644)
+    if os.path.exists(key):
+        os.chown(key,pwdObj.pw_uid,pwdObj.pw_gid)
+        os.chmod(key, 0600)
 
     ip, mac, client_type = get_ip_mac_type()
     data = open(client_req_file).read()
@@ -245,7 +248,7 @@ def get_certificate(cert_path, data_path, certbase, client_cert_path,user_name):
         print e
         return None
     os.chown(cert_file, pwdObj.pw_uid, pwdObj.pw_gid)
-    os.chmod(cert_file, 0700)
+    os.chmod(cert_file, 0600)
 
     os.unlink(req_id_file)
     print _('Certificate save. Your certificate id = %s') %req_id

core/server/cl_server.py

@@ -225,7 +225,6 @@ def main(*args, **keywords):
     server.ssl_private_key = key
 
     try:
-        print _("Server start")
         if args.pidfile:
             try:
                 open(args.pidfile,"w").write(str(os.getpid()))
@@ -233,17 +232,22 @@ def main(*args, **keywords):
                 sys.stderr.write(
                     _("Can not create pid file %s")%args.pidfile+"\n")
                 sys.exit(1)
+        print _("Server start")
         server.start()
     except KeyboardInterrupt:
         try:
             tc.killall()
         except KeyboardInterrupt:
             pass
-        print _("\nServer stopping")
+        print '\n'+_("Server stopping")
         server.stop()
         sys.exit(0)
     except socket.error, e:
-        print e
+        if e.message == "No socket could be created":
+            print _("No socket could be created")
+            print _('Port %d already in use') %port
+        else:
+            print e
     except SSLError, e:
         print '\n',_('Server certificate not found')#, e
         print _('use cl-core with key --gen-cert-by HOST '

ru/cl_core.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calculate-api\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-04 17:44+0300\n"
-"PO-Revision-Date: 2012-06-04 17:45+0300\n"
+"POT-Creation-Date: 2012-06-06 09:09+0300\n"
+"PO-Revision-Date: 2012-06-06 09:10+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -689,27 +689,27 @@ msgstr ""
 "\n"
 "Внимание! %s пытается подменить сертификат!\n"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:203
+#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:141
 msgid "monitoring start"
 msgstr "Общий мониторинг запущен"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:205
+#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:143
 msgid "Error monitoring"
 msgstr "Ошибка мониторинга"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:211
+#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:149
 msgid "session monitoring start\n"
 msgstr "Запущен мониторинг сессий\n"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:213
+#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:151
 msgid "Error sid_mon\n"
 msgstr "Ошибка мониторинга сессий\n"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:216
+#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:154
 msgid "Closed all process"
 msgstr "Завершаю все процессы"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:229
+#: /var/calculate/mydir/git/calculate-api/core/server/baseClass.py:167
 msgid "All processes are closed."
 msgstr "Все процессы закрыты."
 
@@ -891,13 +891,13 @@ msgstr "Сертификат клиента создан"
 msgid "not exists client certificate path"
 msgstr "не создан путь к сертификату клиента"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:251
+#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:254
 #: /var/calculate/mydir/git/calculate-api/core/server/cert_cmd.py:262
 #, python-format
 msgid "Certificate save. Your certificate id = %s"
 msgstr "Сертификат сохранён. Номер Вашего сертификата = %s"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:325
+#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:328
 msgid "You really want to remove all certificates, requests and config files on server"
 msgstr "Вы действительно хотите удалить все сертификаты, запросы и конфигурационные файлы на сервере"
 
@@ -1487,15 +1487,15 @@ msgstr "сервер прослушивает https://0.0.0.0:%d"
 msgid "wsdl is at: https://0.0.0.0:%d/?wsdl"
 msgstr "wsdl находится на: https://0.0.0.0:%d/?wsdl"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:228
-msgid "Server start"
-msgstr "Сервер запущен"
-
-#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:234
+#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:233
 #, python-format
 msgid "Can not create pid file %s"
 msgstr "не удаётся создать pid файл %s"
 
+#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:235
+msgid "Server start"
+msgstr "Сервер запущен"
+
 #: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:242
 msgid ""
 "\n"
@@ -1504,11 +1504,20 @@ msgstr ""
 "\n"
 "Сервер остановлен"
 
+#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:247
+msgid "No socket could be created"
+msgstr "Не получается создать сокет"
+
 #: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:248
+#, python-format
+msgid "Port %d already in use"
+msgstr "Порт %d уже используется"
+
+#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:252
 msgid "Server certificate not found"
 msgstr "Сертификат сервера не найден"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:249
+#: /var/calculate/mydir/git/calculate-api/core/server/cl_server.py:253
 msgid "use cl-core with key --gen-cert-by HOST (--get-cert-from HOST) or --use-root-as-server)"
 msgstr "используйте cl-core с ключом --gen-cert-by HOST (--get-cert-from HOST) или --use-root-as-server)"