diff --git a/ckanext/odsh/lib/odsh_icap_client.py b/ckanext/odsh/lib/odsh_icap_client.py index 1fe221324d030af63f202c5670150fad0fddea58..f78d3e7cdd5f6e204bdec099bd203064c1735546 100644 --- a/ckanext/odsh/lib/odsh_icap_client.py +++ b/ckanext/odsh/lib/odsh_icap_client.py @@ -11,6 +11,7 @@ class ODSHICAPRequest(object): def __init__(self, FILENAME, FILEBUFF): config = [] + log.debug("Creates an ODSH ICAP request.") self.HOST = "10.61.127.77" #'10.61.127.77' self.PORT = 1344 @@ -25,13 +26,13 @@ class ODSHICAPRequest(object): try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) except socket.error as msg: - #log.error(msg[1]) + log.error(msg[1]) sys.exit(1) try: sock.connect((self.HOST, self.PORT)) except socket.error as msg: - #log.error(msg[1]) + log.error(msg[1]) sys.exit(2) # create and send header @@ -46,7 +47,7 @@ class ODSHICAPRequest(object): data_response = self._recvall(sock) response_object = self._parse_response(data_response) - #log.info("----- Finished ICAP-Request via RESPMOD -----") + log.info("----- Finished ICAP-Request via RESPMOD -----") return response_object @@ -74,12 +75,12 @@ class ODSHICAPRequest(object): return icapRequest def _sendfile(self, fileBuffer, sock): - #log.info('Start sending file.') + log.info('Start sending file.') PACK_SIZE = 1024 # in bytes l = fileBuffer.read(PACK_SIZE) while(l): - #log.info('Sending {} bytes of data...'.format(len(l))) + log.info('Sending {} bytes of data...'.format(len(l))) sock.send('{:02X}'.format(len(l)).encode()) sock.send("\r\n".encode()) sock.send(l) @@ -87,23 +88,23 @@ class ODSHICAPRequest(object): l = fileBuffer.read(PACK_SIZE) def _sendfile_old(self, fileName, sock): - #log.info('OLD: Start sending file.') + log.info('OLD: Start sending file.') PACK_SIZE = 1024 # in bytes with open(fileName) as f: l = f.read(PACK_SIZE) while(l): - #log.info('Sending {} bytes of data...'.format(len(l))) + log.info('Sending {} bytes of data...'.format(len(l))) sock.send('{:02X}'.format(len(l)).encode()) sock.send("\r\n".encode()) sock.send(l) sock.send("\r\n".encode()) l = f.read(PACK_SIZE) - #log.info('Done sending.') + log.info('Done sending.') def _recvall(self, sock): - #log.info('Receiving response from icap server...') + log.info('Receiving response from icap server...') BUFF_SIZE = 4096 # 4 KiB data = b'' while True: @@ -115,7 +116,7 @@ class ODSHICAPRequest(object): return data def _parse_response(self, data_response): - #log.info('Parsing response...') + log.info('Parsing response...') lines = data_response.split('\r\n') http_status_code = self._parse_response_http_statuscode(lines) http_block = self._parse_block(lines, 'HTTP/1.1') @@ -165,7 +166,7 @@ class ODSHParsedICAPResponse(object): def virus_found(self): if (self.http_status_code != 200) and (self.http_status_code != 403): msg = 'Received an unknown http response code: {}'.format(self.http_status_code) - #log.warning(msg) + log.warning(msg) raise UnknownResponseException(msg) return self.http_status_code != 200