--- parser3/src/classes/op.C 2024/12/23 16:59:17 1.271 +++ parser3/src/classes/op.C 2025/01/10 20:16:33 1.274 @@ -18,7 +18,11 @@ #include "pa_vclass.h" #include "pa_charset.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.271 2024/12/23 16:59:17 moko Exp $"; +#ifdef HAVE_SYSLOG +#include "syslog.h" +#endif + +volatile const char * IDENT_OP_C="$Id: op.C,v 1.274 2025/01/10 20:16:33 moko Exp $"; // defines @@ -680,7 +684,8 @@ static void locked_process_and_cache_put prolog.expires=info.scope->expires; // buffer -write> file - write(f, serialized.str, serialized.length); + if(write(f, serialized.str, serialized.length)<0) + throw Exception("file.write", 0, "write failed: %s (%d)", strerror(errno), errno); } else // expired! info.scope->expires=0; // flag it so that could be easily checked by caller } @@ -738,7 +743,7 @@ static Cache_get_result cache_get(const static time_t as_expires(Request& r, MethodParams& params, int index, time_t now) { time_t result; if(VDate* vdate=dynamic_cast(¶ms[index])) - result=vdate->get_time(); + result=(time_t)vdate->get_time(); else result=now+(time_t)params.as_double(index, "lifespan must be date or number", r); @@ -901,6 +906,33 @@ static void _sleep_operator(Request& r, pa_sleep((int)trunc(seconds), (int)trunc((seconds-trunc(seconds))*1000000)); } +#ifdef HAVE_SYSLOG +static int log_level(const String &name){ + if(name.is_empty()) return LOG_INFO; + const char *sname = str_upper(name.cstr()); + + if(!strcmp(sname,"INFO")) return LOG_INFO; + if(!strcmp(sname,"WARNING")) return LOG_WARNING; + if(!strcmp(sname,"ERROR")) return LOG_ERR; + if(!strcmp(sname,"DEBUG")) return LOG_DEBUG; + throw Exception("syslog", &name, "invalid log level value"); +} +#endif + +static void _syslog_operator(Request& r, MethodParams& params) { + const char* ident=params.as_string(0, "ident must be string").cstr(); + const char* message=params.as_string(1, "message must be string").cstr(); +#ifdef HAVE_SYSLOG + int level=params.count()>2 ? log_level(params.as_string(2, "level must be string")) : LOG_INFO; + + openlog(*ident ? ident : "parser3", LOG_PID, LOG_USER); + syslog(level, "%s", message); + closelog(); +#else + SAPI::log(r.sapi_info, "syslog: %s", message); +#endif +} + #if defined(WIN32) && defined(_DEBUG) && !defined(_WIN64) # define PA_BPT static void _bpt(Request&, MethodParams&) { @@ -989,6 +1021,9 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL add_native_method("throw", Method::CT_ANY, _throw_operator, 1, 3); add_native_method("sleep", Method::CT_ANY, _sleep_operator, 1, 1); + + // ^syslog[ident;message[;info|warning|error|debug]] + add_native_method("syslog", Method::CT_ANY, _syslog_operator, 2, 3); } // constructor & configurator