Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 00fab92324c535a6a6a89147367913cb5b7b423e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00fab92324c535… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 07:40:15 2015 +0100 Fixed .PHONY targets. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab6353c..888289f 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,9 @@ HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ agents/special/* \ $$(find agents/plugins -type f) -.PHONY: help install clean +.PHONY: all check-binaries check check-permissions check-spaces check-version \ + clean dist headers healspaces help iwyu minify-js mk-eventd \ + mk-livestatus mrproper optimize-images packages setup setversion version all: dist packages

8 years, 7 months

fixed fix of esx_vsphere_datastores...

by Andreas Boesl

Module: check_mk Branch: master Commit: ea6ef91aab8fce9c0c69d2923118e03e699c2ef1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea6ef91aab8fce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 9 13:54:54 2015 +0100 fixed fix of esx_vsphere_datastores... --- checks/esx_vsphere_datastores | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 5ef9176..0aba3e3 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -77,6 +77,7 @@ def check_esx_vsphere_datastores(item, params, info): prov_percent = (prov_mb / size_mb) * 100 prov_txt = '' + warn, crit = None, None if 'provisioning_levels' in params: warn, crit = params['provisioning_levels'] levels_text = " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit)

8 years, 8 months

#2783 FIX esx_vsphere_datastores: fixed crash when no provisioning levels were set

by Andreas Boesl

Module: check_mk Branch: master Commit: 71d4c47b732b990241d19642cfad2b46a859ba95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71d4c47b732b99… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 9 13:46:39 2015 +0100 #2783 FIX esx_vsphere_datastores: fixed crash when no provisioning levels were set --- .werks/2783 | 10 ++++++++++ ChangeLog | 1 + checks/esx_vsphere_datastores | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2783 b/.werks/2783 new file mode 100644 index 0000000..4aee48c --- /dev/null +++ b/.werks/2783 @@ -0,0 +1,10 @@ +Title: esx_vsphere_datastores: fixed crash when no provisioning levels were set +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447073109 + + diff --git a/ChangeLog b/ChangeLog index c603c85..49cfed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 2773 FIX: omd_staomd_status: handle case where site's software installation is broken * 2754 FIX: ipmitool: Killing asynchronous ipmitool call after 300 seconds... * 2755 FIX: apc_symmetra: Check is handling missing data more robust now + * 2783 FIX: esx_vsphere_datastores: fixed crash when no provisioning levels were set Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index d7b55e8..5ef9176 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -90,8 +90,12 @@ def check_esx_vsphere_datastores(item, params, info): infotext += ", uncommitted: %.2f GB, provisioning: %.1f%%%s" % ( uncommitted_mb / 1024, prov_percent, prov_txt) if perfdata: - prov_warn_mb = size_mb / 100 * warn - prov_crit_mb = size_mb / 100 * crit + if warn: + prov_warn_mb = size_mb / 100 * warn + prov_crit_mb = size_mb / 100 * crit + else: + prov_warn_mb = None + prov_crit_mb = None perfdata += [ ('uncommitted', str(uncommitted_mb) + 'MB'), ('overprovisioned', str(prov_mb) + 'MB', prov_warn_mb, prov_crit_mb),

8 years, 8 months

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 96162c544cdd12e62d381426a08e8d187ec48f92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96162c544cdd12… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 9 13:44:37 2015 +0100 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7ab19b5..e8b6b61 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2783 +2833

8 years, 8 months

No need for __attribute__((unused)) Kung Fu in C++.

by Sven Panne

Module: check_mk Branch: master Commit: 516b751294803bb0516a662ac84bd730fd8cd4d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=516b751294803b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 9 13:11:26 2015 +0100 No need for __attribute__((unused)) Kung Fu in C++. --- livestatus/src/Column.h | 5 ++--- livestatus/src/EmptyColumn.cc | 2 +- livestatus/src/Filter.h | 6 +++--- livestatus/src/GlobalCountersColumn.h | 2 +- livestatus/src/LogCache.cc | 2 +- livestatus/src/NullColumn.cc | 2 +- livestatus/src/OffsetStringHostMacroColumn.cc | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/Table.h | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 6ada555..c594d2a 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -54,12 +54,11 @@ public: virtual ~Column() {} const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } - virtual std::string valueAsString(void *data __attribute__ ((__unused__)), Query *) - { return "invalid"; } + virtual std::string valueAsString(void *, Query *) { return "invalid"; } virtual int type() = 0; virtual void output(void *data, Query *) = 0; virtual bool mustDelete() { return false; } // true for dynamic Columns to be deleted after Query - virtual Filter *createFilter(int opid __attribute__ ((__unused__)), char *value __attribute__ ((__unused__))) { return 0; } + virtual Filter *createFilter(int, char *) { return 0; } void *shiftPointer(void *data); void setExtraOffset(int o) { _extra_offset = o; } }; diff --git a/livestatus/src/EmptyColumn.cc b/livestatus/src/EmptyColumn.cc index 142d509..ca038ac 100644 --- a/livestatus/src/EmptyColumn.cc +++ b/livestatus/src/EmptyColumn.cc @@ -26,7 +26,7 @@ #include "Query.h" -void EmptyColumn::output(void *data __attribute__ ((__unused__)), Query *query) +void EmptyColumn::output(void *, Query *query) { query->outputString(""); } diff --git a/livestatus/src/Filter.h b/livestatus/src/Filter.h index a26d43b..cfd9d2a 100644 --- a/livestatus/src/Filter.h +++ b/livestatus/src/Filter.h @@ -54,9 +54,9 @@ public: void setColumn(Column *c) { _column = c; } Column *column() { return _column; } virtual bool accepts(void *data) = 0; - virtual void *indexFilter(const char *columnname __attribute__ ((__unused__))) { return 0; } - virtual void findIntLimits(const char *columnname __attribute__ ((__unused__)), int *lower __attribute__ ((__unused__)), int *upper __attribute__ ((__unused__))) {} - virtual bool optimizeBitmask(const char *columnname __attribute__ ((__unused__)), uint32_t *mask __attribute__ ((__unused__))) { return false; } + virtual void *indexFilter(const char *) { return 0; } + virtual void findIntLimits(const char *, int *, int *) {} + virtual bool optimizeBitmask(const char *, uint32_t *) { return false; } }; #endif // Filter_h diff --git a/livestatus/src/GlobalCountersColumn.h b/livestatus/src/GlobalCountersColumn.h index 7b618b5..39bec33 100644 --- a/livestatus/src/GlobalCountersColumn.h +++ b/livestatus/src/GlobalCountersColumn.h @@ -42,7 +42,7 @@ public: : Column(name, description, -1), _counter_index(counter_index), _do_average(do_average) {} int type() { return _do_average ? COLTYPE_DOUBLE : COLTYPE_INT; } void output(void *, Query *); - Filter *createFilter(int operator_id __attribute__ ((__unused__)), char *value __attribute__ ((__unused__))) { return 0; } + Filter *createFilter(int, char *) { return 0; } }; #endif // GlobalCountersColumn_h diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 5fb90ec..78fdb69 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -213,7 +213,7 @@ void LogCache::dumpLogfiles() The parameters to this method reflect the current query, not the messages that just has been loaded. */ -void LogCache::handleNewMessage(Logfile *logfile, time_t since __attribute__ ((__unused__)), time_t until __attribute__ ((__unused__)), unsigned logclasses) +void LogCache::handleNewMessage(Logfile *logfile, time_t, time_t, unsigned logclasses) { if ( static_cast<unsigned long>(++num_cached_log_messages) <= _max_cached_messages ) return; // current message count still allowed, everything ok diff --git a/livestatus/src/NullColumn.cc b/livestatus/src/NullColumn.cc index d47e515..2ab522c 100644 --- a/livestatus/src/NullColumn.cc +++ b/livestatus/src/NullColumn.cc @@ -26,7 +26,7 @@ #include "Query.h" -void NullColumn::output(void *data __attribute__ ((__unused__)), Query *query) +void NullColumn::output(void *, Query *query) { query->outputNull(); } diff --git a/livestatus/src/OffsetStringHostMacroColumn.cc b/livestatus/src/OffsetStringHostMacroColumn.cc index e9a22b3..ca7c9ca 100644 --- a/livestatus/src/OffsetStringHostMacroColumn.cc +++ b/livestatus/src/OffsetStringHostMacroColumn.cc @@ -31,7 +31,7 @@ host *OffsetStringHostMacroColumn::getHost(void *data) return (host *)data; } -service *OffsetStringHostMacroColumn::getService(void *data __attribute__ ((__unused__))) +service *OffsetStringHostMacroColumn::getService(void *) { return 0; } diff --git a/livestatus/src/OffsetStringMacroColumn.cc b/livestatus/src/OffsetStringMacroColumn.cc index 4c879c4..0bfe620 100644 --- a/livestatus/src/OffsetStringMacroColumn.cc +++ b/livestatus/src/OffsetStringMacroColumn.cc @@ -74,7 +74,7 @@ void OffsetStringMacroColumn::output(void *data, Query *query) query->outputString(s.c_str()); } -Filter *OffsetStringMacroColumn::createFilter(int opid __attribute__ ((__unused__)), char *value __attribute__ ((__unused__))) +Filter *OffsetStringMacroColumn::createFilter(int, char *) { logger(LG_INFO, "Sorry. No filtering on macro columns implemented yet"); return new AndingFilter(); // always true diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index 7a813a3..0551a65 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -53,7 +53,7 @@ public: virtual const char *name() = 0; virtual const char *prefixname() { return name(); } virtual bool isAuthorized(contact *, void *) { return true; } - virtual void *findObject(char *objectspec __attribute__ ((__unused__))) { return 0; } // objectspec may be modified while parsing + virtual void *findObject(char *) { return 0; } // objectspec may be modified while parsing void addColumn(Column *); bool hasColumn(Column *); void addDynamicColumn(DynamicColumn *);

8 years, 8 months

Enabled format string checks. Fixed the resulting warnings.

by Sven Panne

Module: check_mk Branch: master Commit: f9ce41b949112c6b01a4943029932236284bd6d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9ce41b949112c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 9 13:03:29 2015 +0100 Enabled format string checks. Fixed the resulting warnings. Special note: POSIX doesn't even require pthread_t to be an arithmetic type anymore! --- livestatus/src/AndingFilter.cc | 5 +++-- livestatus/src/Logfile.cc | 6 ++++-- livestatus/src/Query.cc | 2 +- livestatus/src/TableDownComm.cc | 2 +- livestatus/src/logger.h | 2 +- livestatus/src/module.c | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 416bbc0..568dc16 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AndingFilter.h" +#include <inttypes.h> #include "OringFilter.h" #include "Query.h" #include "logger.h" @@ -111,8 +112,8 @@ bool AndingFilter::optimizeBitmask(const char *columnname, uint32_t *mask) void AndingFilter::combineFilters(int count, int andor) { if (count > (int)_subfilters.size()) { - logger(LG_INFO, "Cannot combine %d filters with '%s': only %d are on stack", - count, andor == ANDOR_AND ? "AND" : "OR", _subfilters.size()); + logger(LG_INFO, "Cannot combine %d filters with '%s': only %" PRIuMAX " are on stack", + count, andor == ANDOR_AND ? "AND" : "OR", static_cast<uintmax_t>(_subfilters.size())); return; } diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 93baa4c..45547b8 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -25,6 +25,7 @@ #include "Logfile.h" #include <errno.h> #include <fcntl.h> +#include <inttypes.h> #include <stdlib.h> #include <string.h> #include <syslog.h> @@ -157,7 +158,7 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, while (fgets(_linebuffer, MAX_LOGLINE, file)) { if (_lineno >= g_max_lines_per_logfile) { - logger(LG_ERR, "More than %u lines in %s. Ignoring the rest!", g_max_lines_per_logfile, this->_path); + logger(LG_ERR, "More than %lu lines in %s. Ignoring the rest!", g_max_lines_per_logfile, this->_path); return; } _lineno++; @@ -315,7 +316,8 @@ char *Logfile::readIntoBuffer(int *size) return 0; } else if (r != *size) { - logger(LOG_WARNING, "Read only %d out of %d bytes from %s", r, *size, _path); + logger(LOG_WARNING, "Read only %" PRIdMAX " out of %d bytes from %s", + static_cast<intmax_t>(r), *size, _path); free(buffer); close(fd); return 0; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 47946ff..50a4e96 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -865,7 +865,7 @@ bool Query::timelimitReached() bool Query::processDataset(void *data) { if (_output->size() > g_max_response_size) { - logger(LG_INFO, "Maximum response size of %d bytes exceeded!", g_max_response_size); + logger(LG_INFO, "Maximum response size of %lu bytes exceeded!", g_max_response_size); // _output->setError(RESPONSE_CODE_LIMIT_EXCEEDED, "Maximum response size of %d reached", g_max_response_size); // currently we only log an error into the log file and do // not abort the query. We handle it like Limit: diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 0ab1509..bfcca21 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -145,7 +145,7 @@ void TableDownComm::remove(DowntimeOrComment *data) dc_key tmp_key = make_pair(data->_id, data->_service != 0); _entries_t::iterator it = _entries.find(tmp_key); if (it == _entries.end()) - logger(LG_INFO, "Cannot delete non-existing downtime/comment %u", data->_id); + logger(LG_INFO, "Cannot delete non-existing downtime/comment %lu", data->_id); else { delete it->second; _entries.erase(it); diff --git a/livestatus/src/logger.h b/livestatus/src/logger.h index b2129c9..a7ec3dd 100644 --- a/livestatus/src/logger.h +++ b/livestatus/src/logger.h @@ -50,7 +50,7 @@ extern "C" { #endif -void logger(int priority, const char *loginfo, ...); +void logger(int priority, const char *loginfo, ...) __attribute__ ((format (printf, 2, 3))); void open_logfile(); void close_logfile(); diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 55489bc..6f744f7 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -291,7 +291,7 @@ void terminate_threads() int t; for (t=0; t < g_num_clientthreads; t++) { if (0 != pthread_join(g_clientthread_id[t], NULL)) - logger(LG_INFO, "Warning: could not join thread %p", g_clientthread_id[t]); + logger(LG_INFO, "Warning: could not join thread no. %d", t); } if (g_debug_level > 0) logger(LG_INFO, "Main thread + %d client threads have finished", g_num_clientthreads);

8 years, 8 months

temperature.include: Removed lower levels from perfdata output

by Konstantin Büttner

Module: check_mk Branch: master Commit: 01e9e14f56488c7ddacb8988c73a75ab8003c922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01e9e14f56488c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 9 11:55:33 2015 +0100 temperature.include: Removed lower levels from perfdata output Previously, values for lower levels were written to the positions defined as min/max. This served no practical purpose and is flat out wrong. --- checks/temperature.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/temperature.include b/checks/temperature.include index a4ec436..fde1206 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -198,7 +198,7 @@ def check_temperature(reading, params, dev_unit = "c", else: status = max(status, dev_status) - perfdata = [ ("temp", temp, warn, crit, warn_lower, crit_lower) ] + perfdata = [ ("temp", temp, warn, crit) ] # Render actual temperature, e.g. "17.8 °F" infotext = "%s %s" % (render_temp(temp, output_unit), temp_unitsym[output_unit])

8 years, 8 months

#2447 FIX Fixed sorting of performancedata values with units

by Andreas Boesl

Module: check_mk Branch: master Commit: 3d7e70b94ace08bf280fbb69f0ce53b728729f0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d7e70b94ace08… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 9 11:41:34 2015 +0100 #2447 FIX Fixed sorting of performancedata values with units The sorting of performancedata values like <i>rta=0.087ms;200.000;500.000;0;</i> was broken. The sorter did not work when a unit was attached to the value. --- .werks/2447 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/sorters.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2447 b/.werks/2447 new file mode 100644 index 0000000..275f492 --- /dev/null +++ b/.werks/2447 @@ -0,0 +1,11 @@ +Title: Fixed sorting of performancedata values with units +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447065454 + +The sorting of performancedata values like <i>rta=0.087ms;200.000;500.000;0;</i> was broken. +The sorter did not work when a unit was attached to the value. diff --git a/ChangeLog b/ChangeLog index ef83a5d..c603c85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 2722 FIX: Fixed some icon links from views opening in dashlet frames instead of the whole page... * 2729 FIX: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists * 2709 FIX: fixed exception when opening the action menu... + * 2447 FIX: Fixed sorting of performancedata values with units... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index b668ecb..da30c81 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -167,7 +167,7 @@ declare_1to1_sorter("svc_staleness", cmp_simple_number) declare_1to1_sorter("svc_servicelevel", cmp_simple_number) def cmp_perfdata_nth_value(r1, r2, n): - return cmp(savefloat(get_perfdata_nth_value(r1, n)), savefloat(get_perfdata_nth_value(r2, n))) + return cmp(savefloat(get_perfdata_nth_value(r1, n, True)), savefloat(get_perfdata_nth_value(r2, n, True))) multisite_sorters['svc_perf_val01'] = { "title" : _("Service performance data - value number %02d" % 1),

8 years, 8 months

Bug fix: Handled failed realloc in a safer way.

by Sven Panne

Module: check_mk Branch: master Commit: 869181b9bf74b164fb5939922e50a8ac1ef7e4c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=869181b9bf74b1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 9 09:10:03 2015 +0100 Bug fix: Handled failed realloc in a safer way. --- livestatus/src/OutputBuffer.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 0aaad9e..c3b8c1e 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -79,6 +79,8 @@ void OutputBuffer::addBuffer(const char *buf, unsigned len) _writepos += len; } +// TODO: All this code is highly error-prone due to overflow, failed allocations +// etc. We should just use vector instead. void OutputBuffer::needSpace(unsigned len) { if (_writepos + len > _end) @@ -88,7 +90,11 @@ void OutputBuffer::needSpace(unsigned len) while (_max_size < needed) // double, until enough space _max_size *= 2; - _buffer = (char *)realloc(_buffer, _max_size); + char* new_buffer = static_cast<char*>(realloc(_buffer, _max_size)); + // It's better to crash voluntarily than overwriting random memory later. + if (!new_buffer) abort(); + + _buffer = new_buffer; _writepos = _buffer + s; _end = _buffer + _max_size; }

8 years, 8 months

Bug fix: va_start and va_end must be balanced. Always.

by Sven Panne

Module: check_mk Branch: master Commit: e1ae5ae14956af369982566d2e74136d30edc556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1ae5ae14956af… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 9 08:55:01 2015 +0100 Bug fix: va_start and va_end must be balanced. Always. --- livestatus/src/logger.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index 7a0d014..fec46b4 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -61,9 +61,8 @@ void logger(int priority, const char *loginfo, ...) if (!g_logfile || g_mainthread_id == pthread_self()) { char buffer[8192]; snprintf(buffer, 20, "livestatus: "); - vsnprintf(buffer + strlen(buffer), - sizeof(buffer) - strlen(buffer), loginfo, ap); - va_end(ap); + vsnprintf(buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), + loginfo, ap); write_to_all_logs(buffer, priority); } else { @@ -71,7 +70,8 @@ void logger(int priority, const char *loginfo, ...) /* write date/time */ char timestring[64]; time_t now_t = time(0); - struct tm now; localtime_r(&now_t, &now); + struct tm now; + localtime_r(&now_t, &now); strftime(timestring, 64, "%F %T ", &now); fputs(timestring, g_logfile); @@ -79,7 +79,7 @@ void logger(int priority, const char *loginfo, ...) vfprintf(g_logfile, loginfo, ap); fputc('\n', g_logfile); fflush(g_logfile); - va_end(ap); } } + va_end(ap); }

8 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015