From 4a3db50d7df0f636ef824637d33330543e9044b2 Mon Sep 17 00:00:00 2001
From: Andrew <saintruler@gmail.com>
Date: Wed, 24 Apr 2019 20:42:29 +0400
Subject: =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D1=82=D1=80=D0=B5=D1=82=D1=8C=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 day4/task3/server.py | 53 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

(limited to 'day4/task3/server.py')

diff --git a/day4/task3/server.py b/day4/task3/server.py
index f4e5ebe..3aea050 100644
--- a/day4/task3/server.py
+++ b/day4/task3/server.py
@@ -6,6 +6,10 @@ import json
 import time
 
 
+HOST, PORT = ADDR = '0.0.0.0', 6000
+DATATYPE_SIZE = 4  # int
+
+
 def pack_data(data):
     encoded = data.encode()
     return struct.pack('I', len(encoded)) + encoded
@@ -28,14 +32,15 @@ def handle_request(data):
 
 def get_data(connection):
     buffer = b''
-    while len(buffer) < 4:
-        data = connection.recv(4 - len(buffer))
+    # Считываем размер пакета
+    while len(buffer) < DATATYPE_SIZE:
+        data = connection.recv(DATATYPE_SIZE - len(buffer))
         if not data:
             raise ConnectionError('Connection was closed')
 
         buffer += data
 
-    size_packed, buffer = buffer[:4], buffer[4:]
+    size_packed, buffer = buffer[:DATATYPE_SIZE], buffer[DATATYPE_SIZE:]
     if not size_packed:
         raise ConnectionError('Connection was closed')
 
@@ -68,20 +73,28 @@ def handle_connection(connection, address):
             connection.sendall(response)
 
 
-HOST, PORT = ADDR = '0.0.0.0', 6000
-sock = socket.socket()
-sock.bind(ADDR)
-sock.listen(5)
-
-while True:
-    print('Listening for new connections...')
-    try:
-        connection, address = sock.accept()
-        print(f'Got a connection from {address[0]}')
-        handle_connection(connection, address)
-
-    except KeyboardInterrupt:
-        print('Stopping server...')
-        sock.close()
-        print('Server stopped')
-        break
+def main():
+    sock = socket.socket()
+    sock.bind(ADDR)
+    sock.listen(5)
+
+    while True:
+        print('Listening for new connections...')
+        try:
+            connection, address = sock.accept()
+            print(f'Got a connection from {address[0]}')
+            handle_connection(connection, address)
+
+        except KeyboardInterrupt:
+            print('Stopping server...')
+            sock.close()
+            print('Server stopped')
+            break
+
+
+if __name__ == '__main__':
+    success = db.init('otrs_error.log')
+    if not success:
+        print('Не удалось инициализировать базу данных. Завершаем работу...')
+    else:
+        main()
-- 
cgit v1.2.3