diff options
| author | Sean Reifscheider <jafo@tummy.com> | 2010-04-25 06:31:55 (GMT) |
|---|---|---|
| committer | Sean Reifscheider <jafo@tummy.com> | 2010-04-25 06:31:55 (GMT) |
| commit | 7f810cd91576ad43babdbd94647ceda613024fbb (patch) | |
| tree | 88492b93902b6d01ed9b9b6e8e9987f0d0c6ee40 /Modules/syslogmodule.c | |
| parent | 40f0874b5556b278526ee9443b83efa2a6f723ca (diff) | |
| download | cpython-7f810cd91576ad43babdbd94647ceda613024fbb.zip cpython-7f810cd91576ad43babdbd94647ceda613024fbb.tar.gz cpython-7f810cd91576ad43babdbd94647ceda613024fbb.tar.bz2 | |
Porting commit 80458 to python 3
Diffstat (limited to 'Modules/syslogmodule.c')
| -rw-r--r-- | Modules/syslogmodule.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c index 2281c1d..e605df2 100644 --- a/Modules/syslogmodule.c +++ b/Modules/syslogmodule.c @@ -56,6 +56,7 @@ Revision history: /* only one instance, only one syslog, so globals should be ok */ static PyObject *S_ident_o = NULL; /* identifier, held by openlog() */ +static char S_log_open = 0; static PyObject * @@ -135,6 +136,7 @@ syslog_openlog(PyObject * self, PyObject * args, PyObject *kwds) */ openlog(S_ident_o ? _PyUnicode_AsString(S_ident_o) : NULL, logopt, facility); + S_log_open = 1; Py_INCREF(Py_None); return Py_None; @@ -160,8 +162,8 @@ syslog_syslog(PyObject * self, PyObject * args) if (message == NULL) return NULL; - /* call openlog if no current identifier */ - if (!S_ident_o) { + /* if log is not opened, open it now */ + if (!S_log_open) { PyObject *openargs; /* Continue even if PyTuple_New fails, because openlog(3) is optional. @@ -184,9 +186,12 @@ syslog_syslog(PyObject * self, PyObject * args) static PyObject * syslog_closelog(PyObject *self, PyObject *unused) { - closelog(); - Py_XDECREF(S_ident_o); - S_ident_o = NULL; + if (S_log_open) { + closelog(); + Py_XDECREF(S_ident_o); + S_ident_o = NULL; + S_log_open = 0; + } Py_INCREF(Py_None); return Py_None; } |