From 94cc6060c30c879a291d54e4a528af4730a3edfb Mon Sep 17 00:00:00 2001 From: Vlad Max Date: Fri, 10 Aug 2018 23:24:53 +0700 Subject: [PATCH 1/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=81=D0=BB=D0=B8=D1=8F?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jim_server.py | 8 +------- jim_user.py | 4 ---- pytest.bat | 4 ---- start_server.bat | 4 ---- test_client_argv.py | 8 +------- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/jim_server.py b/jim_server.py index 848ce45..7fcb725 100644 --- a/jim_server.py +++ b/jim_server.py @@ -282,15 +282,9 @@ def _msg_message_handler(self, socket, jim_msg): else: return user_to.socket, jim_msg -<<<<<<< HEAD - socket.close() - -======= else: return socket, JimMessage.response_message(RESPONSE_CLIENT_NOT_FOUND, self.encoding) else: return socket, JimMessage.response_message(RESPONSE_CLIENT_UNAUTHORIZED, self.encoding) - - ->>>>>>> lesson-2 + diff --git a/jim_user.py b/jim_user.py index 8e8b922..132cdab 100644 --- a/jim_user.py +++ b/jim_user.py @@ -12,8 +12,4 @@ def __init__(self): self.is_active = None self.date_joined = None self.last_login = None -<<<<<<< HEAD -======= - ->>>>>>> lesson-2 diff --git a/pytest.bat b/pytest.bat index 9367a4a..72328d2 100644 --- a/pytest.bat +++ b/pytest.bat @@ -1,8 +1,4 @@ @py -m pytest -v %1 @pause -<<<<<<< HEAD -======= - ->>>>>>> lesson-2 diff --git a/start_server.bat b/start_server.bat index d2abd43..f9ce168 100644 --- a/start_server.bat +++ b/start_server.bat @@ -1,8 +1,4 @@ @py server_main.py %1 %2 %3 %4 @pause -<<<<<<< HEAD -======= - ->>>>>>> lesson-2 diff --git a/test_client_argv.py b/test_client_argv.py index 80b2e78..925174f 100644 --- a/test_client_argv.py +++ b/test_client_argv.py @@ -34,11 +34,6 @@ def test_parse_client_args(): argv = ("client_main.py", "-p", "XXX") assert parse_client_args(argv) == (None, None, None) -<<<<<<< HEAD - argv = ("client_main.py", "localhost", "7777") - assert parse_client_args(argv) == ("localhost", 7777) - -======= argv = ("client_main.py", "-a", "localhost", "-p", "7777") assert parse_client_args(argv) == ("localhost", 7777, None) @@ -47,5 +42,4 @@ def test_parse_client_args(): argv = ("client_main.py", "-w", "-a", "localhost", "-p", "7777") assert parse_client_args(argv) == ("localhost", 7777, False) - ->>>>>>> lesson-2 + \ No newline at end of file From acf08c943ed874eb5dd267962d1e82398e843b27 Mon Sep 17 00:00:00 2001 From: Vlad Max <39481940+mrgenisoft@users.noreply.github.com> Date: Fri, 10 Aug 2018 23:10:16 +0700 Subject: [PATCH 2/5] Update jim_user.py --- jim_user.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jim_user.py b/jim_user.py index 132cdab..8e8b922 100644 --- a/jim_user.py +++ b/jim_user.py @@ -12,4 +12,8 @@ def __init__(self): self.is_active = None self.date_joined = None self.last_login = None +<<<<<<< HEAD +======= + +>>>>>>> lesson-2 From e2ebbc9add5c3ed1f4c03fa91752445380d40146 Mon Sep 17 00:00:00 2001 From: Vlad Max <39481940+mrgenisoft@users.noreply.github.com> Date: Fri, 10 Aug 2018 23:10:16 +0700 Subject: [PATCH 3/5] Update jim_user.py --- jim_user.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jim_user.py b/jim_user.py index 8e8b922..4c46371 100644 --- a/jim_user.py +++ b/jim_user.py @@ -12,8 +12,5 @@ def __init__(self): self.is_active = None self.date_joined = None self.last_login = None -<<<<<<< HEAD -======= - ->>>>>>> lesson-2 + From adfa2ac91210c5b7e2663278fb3ace9ad5f790fd Mon Sep 17 00:00:00 2001 From: Vlad Max Date: Fri, 10 Aug 2018 23:30:17 +0700 Subject: [PATCH 4/5] =?UTF-8?q?=D0=B1=D0=BB=D0=B0=D0=B1=20=D0=BB=D0=B0?= =?UTF-8?q?=D0=B2=D1=86=D0=BF=D0=B2=D0=B8=D0=B2=D0=B0=D1=82=D0=B2=D0=B0?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jim_user.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/jim_user.py b/jim_user.py index 4c46371..97ebf91 100644 --- a/jim_user.py +++ b/jim_user.py @@ -12,5 +12,3 @@ def __init__(self): self.is_active = None self.date_joined = None self.last_login = None - - From e40603e31f508adb66f0285145688da433fdb63e Mon Sep 17 00:00:00 2001 From: Vlad Max Date: Mon, 13 Aug 2018 18:41:46 +0700 Subject: [PATCH 5/5] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=9E=D0=9E=D0=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлены классы --- client_log.py | 2 ++ client_main.py | 1 + jim_client.py | 1 + jim_message.py | 1 + jim_server.py | 4 +++- jim_user.py | 2 ++ pytest.bat | 1 + server_log.py | 5 +++-- server_main.py | 3 ++- start_client.bat | 1 + start_server.bat | 1 + test_client_argv.py | 3 ++- test_server_argv.py | 1 + test_server_dispatch_message.py | 1 + 14 files changed, 22 insertions(+), 5 deletions(-) diff --git a/client_log.py b/client_log.py index aa579d3..267a279 100644 --- a/client_log.py +++ b/client_log.py @@ -31,3 +31,5 @@ def log_wrap(*args, **kwargs): logger.addHandler(sh) logger.setLevel(logging.DEBUG) + + diff --git a/client_main.py b/client_main.py index cb77afb..bc672ec 100644 --- a/client_main.py +++ b/client_main.py @@ -46,3 +46,4 @@ else: jim_client.close() + diff --git a/jim_client.py b/jim_client.py index aa021a1..fdcbfeb 100644 --- a/jim_client.py +++ b/jim_client.py @@ -187,3 +187,4 @@ def _send_message(self, out_socket, out_jim_msg): return False + diff --git a/jim_message.py b/jim_message.py index c6845f0..2c97016 100644 --- a/jim_message.py +++ b/jim_message.py @@ -214,3 +214,4 @@ def response_message(response, encoding): return jim_msg + diff --git a/jim_server.py b/jim_server.py index 7fcb725..da27ca2 100644 --- a/jim_server.py +++ b/jim_server.py @@ -3,6 +3,7 @@ import socket import select import time +import socketserver from jim_user import * from jim_message import * @@ -287,4 +288,5 @@ def _msg_message_handler(self, socket, jim_msg): else: return socket, JimMessage.response_message(RESPONSE_CLIENT_UNAUTHORIZED, self.encoding) - + + \ No newline at end of file diff --git a/jim_user.py b/jim_user.py index 97ebf91..b4ff507 100644 --- a/jim_user.py +++ b/jim_user.py @@ -12,3 +12,5 @@ def __init__(self): self.is_active = None self.date_joined = None self.last_login = None + + diff --git a/pytest.bat b/pytest.bat index 72328d2..25f847d 100644 --- a/pytest.bat +++ b/pytest.bat @@ -2,3 +2,4 @@ @py -m pytest -v %1 @pause + diff --git a/server_log.py b/server_log.py index 08a5b20..016cacd 100644 --- a/server_log.py +++ b/server_log.py @@ -2,6 +2,7 @@ import sys import logging +from logging.handlers import TimedRotatingFileHandler from functools import wraps from datetime import date @@ -16,11 +17,11 @@ def log_wrap(*args, **kwargs): return log_wrap -logger_name = f"jim_server_{date.today().isoformat()}" +logger_name = f"jim_server" logger = logging.getLogger(logger_name) formatter = logging.Formatter("%(asctime)s %(levelname)s %(message)s") -fh = logging.FileHandler(f"{logger_name}.log", encoding="utf-8", delay=True) +fh = TimedRotatingFileHandler(f"{logger_name}.log", when="D", encoding="utf-8", delay=True) fh.setLevel(logging.DEBUG) fh.setFormatter(formatter) logger.addHandler(fh) diff --git a/server_main.py b/server_main.py index c9bbb80..8830c97 100644 --- a/server_main.py +++ b/server_main.py @@ -7,7 +7,7 @@ SERVER_HOST = "" SERVER_PORT = 7777 -MAX_USERS = 1 +MAX_USERS = 5 MAX_BUF_SIZE = 1024 PROBE_INTERVAL_SEC = 60 DEFAULT_ENCODING = "utf-8" @@ -41,3 +41,4 @@ jim_server.user_list = user_list jim_server.run_server() + diff --git a/start_client.bat b/start_client.bat index 3d341db..1f440cf 100644 --- a/start_client.bat +++ b/start_client.bat @@ -2,3 +2,4 @@ @py client_main.py %1 %2 %3 %4 %5 @pause + diff --git a/start_server.bat b/start_server.bat index f9ce168..9df8e53 100644 --- a/start_server.bat +++ b/start_server.bat @@ -2,3 +2,4 @@ @py server_main.py %1 %2 %3 %4 @pause + diff --git a/test_client_argv.py b/test_client_argv.py index 925174f..57fdb80 100644 --- a/test_client_argv.py +++ b/test_client_argv.py @@ -42,4 +42,5 @@ def test_parse_client_args(): argv = ("client_main.py", "-w", "-a", "localhost", "-p", "7777") assert parse_client_args(argv) == ("localhost", 7777, False) - \ No newline at end of file + + diff --git a/test_server_argv.py b/test_server_argv.py index cf1a2b6..f659406 100644 --- a/test_server_argv.py +++ b/test_server_argv.py @@ -32,3 +32,4 @@ def test_parse_server_args(): assert parse_server_args(argv) == ("localhost", 7777) + diff --git a/test_server_dispatch_message.py b/test_server_dispatch_message.py index 29a7b08..ade4d70 100644 --- a/test_server_dispatch_message.py +++ b/test_server_dispatch_message.py @@ -112,3 +112,4 @@ def test_server_dispatch_message(): socket_, out_jim_msg = server.dispatch_message(socket.socket(socket.AF_INET, socket.SOCK_STREAM), in_jim_msg) assert out_jim_msg.response == RESPONSE_CLIENT_INVALID_CRED +