technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Handling change file message in libunit.

Browse Source 
This is required for proper log file rotation action.
This commit is contained in:
Max Romanov
2020-03-30 14:18:41 +03:00
parent 82b899b136
commit ab7b42a072
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nxt_unit.c
View File

@@ -767,6 +767,16 @@ nxt_unit_process_msg(nxt_unit_ctx_t *ctx, nxt_unit_port_id_t *port_id,
case _NXT_PORT_MSG_CHANGE_FILE: case _NXT_PORT_MSG_CHANGE_FILE:
nxt_unit_debug(ctx, "#%"PRIu32": change_file: fd %d", nxt_unit_debug(ctx, "#%"PRIu32": change_file: fd %d",
port_msg->stream, recv_msg.fd); port_msg->stream, recv_msg.fd);
if (dup2(recv_msg.fd, lib->log_fd) == -1) {
nxt_unit_alert(ctx, "#%"PRIu32": dup2(%d, %d) failed: %s (%d)",
port_msg->stream, recv_msg.fd, lib->log_fd,
strerror(errno), errno);
goto fail;
}
rc = NXT_UNIT_OK;
break; break;
case _NXT_PORT_MSG_MMAP: case _NXT_PORT_MSG_MMAP:

2
test/python/log_body/wsgi.py
View File

@@ -2,7 +2,7 @@ def application(environ, start_response):
content_length = int(environ.get('CONTENT_LENGTH', 0)) content_length = int(environ.get('CONTENT_LENGTH', 0))
body = bytes(environ['wsgi.input'].read(content_length)) body = bytes(environ['wsgi.input'].read(content_length))
environ['wsgi.errors'].write(body) environ['wsgi.errors'].write(body.decode())
environ['wsgi.errors'].flush() environ['wsgi.errors'].flush()
start_response('200', [('Content-Length', '0')]) start_response('200', [('Content-Length', '0')])

1
test/test_usr1.py
View File

@@ -51,7 +51,6 @@ class TestUSR1(TestApplicationPython):
self.search_in_log(r'/usr1', log_new), 'rename new 2' self.search_in_log(r'/usr1', log_new), 'rename new 2'
) )
@unittest.skip('not yet')
def test_usr1_unit_log(self): def test_usr1_unit_log(self):
self.load('log_body') self.load('log_body')