Skip to content

gh-99127: Allow some features of syslog to the main interpreter only #99128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corona10 merged 23 commits into from
Nov 29, 2022
Merged

gh-99127: Allow some features of syslog to the main interpreter only #99128

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ced41bc
gh-99127: Port syslog module to use module state.
corona10 Nov 5, 2022
8beb461
Address code review
corona10 Nov 5, 2022
d8acc8b
Remove logic to check the openlog status while calling syslog.syslog
corona10 Nov 5, 2022
11d9228
Do not call openlog while calling syslog
corona10 Nov 5, 2022
e7408a8
Fix test_audit
corona10 Nov 5, 2022
69ac18a
nit
corona10 Nov 6, 2022
3a784f6
Address code review
corona10 Nov 6, 2022
f5cf63a
nit
corona10 Nov 6, 2022
fc85827
Address code review
corona10 Nov 11, 2022
f40d953
Add test
corona10 Nov 11, 2022
35bbac2
nit
corona10 Nov 11, 2022
525a32b
Address code review
corona10 Nov 12, 2022
741baf0
Update NEWS.d
corona10 Nov 12, 2022
779a3d2
nit
corona10 Nov 12, 2022
557578f
Revert some logic
corona10 Nov 12, 2022
01334e8
nit
corona10 Nov 12, 2022
4ad2b8f
Address code review
corona10 Nov 14, 2022
696196d
Update Lib/test/test_syslog.py
corona10 Nov 16, 2022
5eeade5
Address code review
corona10 Nov 16, 2022
fb81c1e
Address code review
corona10 Nov 17, 2022
140366b
Update documentations
corona10 Nov 17, 2022
c961709
Address code review
corona10 Nov 17, 2022
e8dce88
Apply suggestions from code review
corona10 Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address code review
  • Loading branch information
@corona10
corona10 committed Nov 17, 2022
commit fb81c1eb81f2a2de720285ee5c90d92ec5d94963
14 changes: 4 additions & 10 deletions Modules/syslogmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,7 @@ static char S_log_open = 0;
static inline int
is_main_interpreter(void)
{
Comment thread
corona10 marked this conversation as resolved.
PyInterpreterState *main_interp = PyInterpreterState_Main();
PyThreadState *tstate = PyThreadState_GET();
PyInterpreterState *current_interp = PyThreadState_GetInterpreter(tstate);
if (current_interp == main_interp) {
return 1;
}
return 0;
return (PyInterpreterState_Get() == PyInterpreterState_Main());
}

static PyObject *
Expand Down Expand Up @@ -150,7 +144,7 @@ syslog_openlog_impl(PyObject *module, PyObject *ident, long logopt,
// Since the sys.openlog changes the process level state of syslog library,
// this operation is only allowed for the main interpreter.
if (!is_main_interpreter()) {
PyErr_SetString(PyExc_RuntimeError, "subinterpreter can not use syslog.openlog");
PyErr_SetString(PyExc_RuntimeError, "subinterpreter can't use syslog.openlog()");
return NULL;
}

Expand Down Expand Up @@ -215,7 +209,7 @@ syslog_syslog_impl(PyObject *module, int group_left_1, int priority,
/* if log is not opened, open it now */
if (!S_log_open) {
if (!is_main_interpreter()) {
PyErr_SetString(PyExc_RuntimeError, "subinterpreter can't use syslog.syslog "
PyErr_SetString(PyExc_RuntimeError, "subinterpreter can't use syslog.syslog() "
"until the syslog is opened by the main interpreter");
return NULL;
}
Expand Down Expand Up @@ -257,7 +251,7 @@ syslog_closelog_impl(PyObject *module)
// Since the sys.closelog changes the process level state of syslog library,
// this operation is only allowed for the main interpreter.
if (!is_main_interpreter()) {
PyErr_SetString(PyExc_RuntimeError, "sunbinterpreter can not use syslog.closelog");
PyErr_SetString(PyExc_RuntimeError, "sunbinterpreter can't use syslog.closelog()");
return NULL;
}

Expand Down