Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: small system call improvement when processing stored walks; removed old stored walk processing code

by Lars Michelsen

Module: check_mk Branch: master Commit: 951c829fedc608a5a94efe3dfe713e1e4c99856c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=951c829fedc608… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 2 13:12:44 2013 +0200 small system call improvement when processing stored walks; removed old stored walk processing code --- modules/snmp.py | 174 +++++++++++++++++++++++-------------------------------- 1 file changed, 74 insertions(+), 100 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index bbc75c7..f938add 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -335,119 +335,93 @@ def get_stored_snmpwalk(hostname, oid): if opt_debug: sys.stderr.write("Getting %s from %s\n" % (oid, path)) - if not os.path.exists(path): - raise MKGeneralException("No snmpwalk file %s\n" % path) rowinfo = [] - use_new = True - if use_new: - # New implementation: use binary search - def to_bin_string(oid): - try: - return tuple(map(int, oid.strip(".").split("."))) - except: - raise MKGeneralException("Invalid OID %s" % oid) - - def compare_oids(a, b): - aa = to_bin_string(a) - bb = to_bin_string(b) - if len(aa) <= len(bb) and bb[:len(aa)] == aa: - result = 0 - else: - result = cmp(aa, bb) - return result - - if hostname in g_walk_cache: - lines = g_walk_cache[hostname] + # New implementation: use binary search + def to_bin_string(oid): + try: + return tuple(map(int, oid.strip(".").split("."))) + except: + raise MKGeneralException("Invalid OID %s" % oid) + + def compare_oids(a, b): + aa = to_bin_string(a) + bb = to_bin_string(b) + if len(aa) <= len(bb) and bb[:len(aa)] == aa: + result = 0 else: + result = cmp(aa, bb) + return result + + if hostname in g_walk_cache: + lines = g_walk_cache[hostname] + else: + try: lines = file(path).readlines() - g_walk_cache[hostname] = lines - - begin = 0 - end = len(lines) - hit = None - while end - begin > 0: - current = (begin + end) / 2 - parts = lines[current].split(None, 1) - comp = parts[0] - hit = compare_oids(oid_prefix, comp) - if hit == 0: - break - elif hit == 1: # we are too low - begin = current + 1 - else: - end = current + except IOError: + raise MKGeneralException("No snmpwalk file %s\n" % path) + g_walk_cache[hostname] = lines + + begin = 0 + end = len(lines) + hit = None + while end - begin > 0: + current = (begin + end) / 2 + parts = lines[current].split(None, 1) + comp = parts[0] + hit = compare_oids(oid_prefix, comp) + if hit == 0: + break + elif hit == 1: # we are too low + begin = current + 1 + else: + end = current - if hit != 0: - return [] # not found + if hit != 0: + return [] # not found - def collect_until(index, direction): - rows = [] - # Handle case, where we run after the end of the lines list - if index >= len(lines): - if direction > 0: - return [] - else: - index -= 1 - while True: - line = lines[index] - parts = line.split(None, 1) - o = parts[0] - if o.startswith('.'): - o = o[1:] - if o == oid or o.startswith(oid_prefix + "."): - if len(parts) > 1: - value = parts[1] - if agent_simulator: - value = agent_simulator_process(value) - else: - value = "" - # Fix for missing starting oids - rows.append(('.'+o, strip_snmp_value(value))) - index += direction - if index < 0 or index >= len(lines): - break + def collect_until(index, direction): + rows = [] + # Handle case, where we run after the end of the lines list + if index >= len(lines): + if direction > 0: + return [] + else: + index -= 1 + while True: + line = lines[index] + parts = line.split(None, 1) + o = parts[0] + if o.startswith('.'): + o = o[1:] + if o == oid or o.startswith(oid_prefix + "."): + if len(parts) > 1: + value = parts[1] + if agent_simulator: + value = agent_simulator_process(value) else: + value = "" + # Fix for missing starting oids + rows.append(('.'+o, strip_snmp_value(value))) + index += direction + if index < 0 or index >= len(lines): break - return rows - - - rowinfo = collect_until(current, -1) - rowinfo.reverse() - rowinfo += collect_until(current + 1, 1) - # import pprint ; pprint.pprint(rowinfo) - - if dot_star: - return [ rowinfo[0] ] - else: - return rowinfo - - - - # Old implementation - hot = False - for line in file(path): - parts = line.split(None, 1) - o = parts[0] - if o.startswith('.'): - o = o[1:] - if o == oid or o.startswith(oid_prefix + "."): - hot = True - if len(parts) > 1: - value = parts[1] - if agent_simulator: - value = agent_simulator_process(value) else: - value = "" - rowinfo.append((o, strip_snmp_value(value))) # return pair of OID and value - if dot_star: break - elif hot: # end of interesting part, no point in further search - break + return rows + + + rowinfo = collect_until(current, -1) + rowinfo.reverse() + rowinfo += collect_until(current + 1, 1) # import pprint ; pprint.pprint(rowinfo) - return rowinfo + + if dot_star: + return [ rowinfo[0] ] + else: + return rowinfo # Helper function to be used in checks. It applies a user-specified # character encoding in order to tranlate e.g. latin1 to utf8

11 years, 2 months

Check_MK Git: check_mk: localize: Using . po from regular hierarchy if no file exists in local-hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 5177eb0cd6192fe6d365f7b96f9ba75705de8096 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5177eb0cd6192f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 2 14:57:17 2013 +0200 localize: Using .po from regular hierarchy if no file exists in local-hierarchy --- modules/localize.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/localize.py b/modules/localize.py index f32130f..9ec0691 100644 --- a/modules/localize.py +++ b/modules/localize.py @@ -245,6 +245,14 @@ def localize_update(lang): except: pass + # Maybe initialize the file in the local hierarchy with the file in + # the default hierarchy + if local_locale_dir and not os.path.exists(po_file) \ + and os.path.exists(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)): + file(po_file, 'w').write(file(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)).read()) + + sys.exit(1) + localize_sniff() if not os.path.exists(po_file): @@ -263,6 +271,12 @@ def localize_compile(lang): init_files(lang) + # Maybe initialize the file in the local hierarchy with the file in + # the default hierarchy + if local_locale_dir and not os.path.exists(po_file) \ + and os.path.exists(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)): + file(po_file, 'w').write(file(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)).read()) + if not os.path.exists(po_file): raise LocalizeException('The .po file %s does not exist.' % po_file)

11 years, 2 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6d55883374239aea93386bbed89f0f1745560b98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d55883374239a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 2 09:23:43 2013 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 45b0f82..eeb072e 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -987 +997

11 years, 2 months

Check_MK Git: check_mk: Cleanup of bug title

by Mathias Kettner

Module: check_mk Branch: master Commit: 4780083ff53ad8fda96f97f29e5bab490aff00d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4780083ff53ad8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 2 09:21:46 2013 +0200 Cleanup of bug title --- .bugs/958 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/958 b/.bugs/958 index 900fdeb..b955651 100644 --- a/.bugs/958 +++ b/.bugs/958 @@ -1,4 +1,4 @@ -Title: Wato / Monitor specific TCP/UDP connections and listeners.................................................................................................... +Title: Wato / Monitor specific TCP/UDP connections and listeners Component: wato State: open Date: 2013-07-05 14:20:29

11 years, 2 months

Check_MK Git: check_mk: updated check_mk_agent.exe executables

by Andreas Boesl

Module: check_mk Branch: master Commit: adc6b1f73740aaa840be12557ea6b2b4bc109802 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adc6b1f73740aa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 1 16:04:01 2013 +0200 updated check_mk_agent.exe executables --- agents/windows/check_mk_agent-64.exe | Bin 178688 -> 179200 bytes agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent-64.exe | Bin 148888 -> 149056 bytes agents/windows/install_agent.exe | Bin 146572 -> 146631 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 33cc7da..48dbf17 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5204606..720d198 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 802e583..0c27b46 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index dac059e..52023f7 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 2 months

Check_MK Git: check_mk: FIX: apply rewriting of application/

by Mathias Kettner

hostname also when cancelling events Message-ID: <51fa6993.4G0e07dt7brUrh/r%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b38d65cff909b0deea5daaae311fe83b885c35fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b38d65cff909b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 1 15:57:08 2013 +0200 FIX: apply rewriting of application/hostname also when cancelling events Conflicts: mkeventd/bin/mkeventd --- ChangeLog | 3 +++ mkeventd/bin/mkeventd | 30 +++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9497af..58a1c7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -295,6 +295,9 @@ * FIX: fix logwatch pattern analyzer message "The host xyz is not managed by WATO." after direct access via snapin + Event Console: + * FIX: apply rewriting of application/hostname also when cancelling events + 1.2.2p2: Core: * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index aedf770..6887e21 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1487,7 +1487,7 @@ class EventServer: return if cancelling: - g_event_status.cancel_events(event, groups, rule["id"]) + g_event_status.cancel_events(event, groups, rule) return else: @@ -2467,29 +2467,41 @@ class EventStatus(): # Cancel all events the belong to a certain rule id and are # of the same "breed" as a new event. - def cancel_events(self, new_event, match_groups, rule_id): + def cancel_events(self, new_event, match_groups, rule): with lock_eventstatus: to_delete = [] for nr, event in enumerate(self._events): - if event["rule_id"] == rule_id: - if self.cancelling_match(match_groups, new_event, event): + if event["rule_id"] == rule["id"]: + if self.cancelling_match(match_groups, new_event, event, rule): log_event_history(event, "CANCELLED") to_delete.append(nr) for nr in to_delete[::-1]: del self._events[nr] - def cancelling_match(self, match_groups, new_event, event): + def cancelling_match(self, match_groups, new_event, event, rule): debug = g_config["debug_rules"] - if event["host"] != new_event["host"]: + + # Note: before we compare host and application we need to + # apply the rewrite rules to the event. Because if in the previous + # the hostname was rewritten, it wouldn't match anymore here. + host = new_event["host"] + if "set_host" in rule: + host = replace_groups(rule["set_host"], host, match_groups) + + if event["host"] != host: if debug: log("Do not cancel event %d: host is not the same (%s != %s)" % - (event["id"], event["host"], new_event["host"])) + (event["id"], event["host"], host)) return False - if event["application"] != new_event["application"]: + # The same for the application + application = new_event["application"] + if "set_application" in rule: + application = replace_groups(rule["set_application"], application, match_groups) + if event["application"] != application: if debug: log("Do not cancel event %d: application is not the same (%s != %s)" % - (event["id"], event["application"], new_event["application"])) + (event["id"], event["application"], application)) return False if event["facility"] != new_event["facility"]:

11 years, 2 months

Check_MK Git: check_mk: fixed: exception when min_states /

by Andreas Boesl

max_states not set Message-ID: <51fa6134.Y5DBZZyo87qK6Qd5%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7d6f6b8087c55cbb7d884917fc45d45482ac0ca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d6f6b8087c55c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 1 15:22:58 2013 +0200 fixed: exception when min_states / max_states not set --- checks/win_netstat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/win_netstat b/checks/win_netstat index 1f03b39..3f8d874 100644 --- a/checks/win_netstat +++ b/checks/win_netstat @@ -110,7 +110,7 @@ def check_win_netstat(item, params, info): state = 0 extra_info = "" - if params["min_states"]: + if params.get("min_states"): min_warn, min_crit = params["min_states"] if found <= min_crit: state = max(state, 2) @@ -119,7 +119,7 @@ def check_win_netstat(item, params, info): state = max(state, 1) extra_info += '(!) Minimum at %d ' % min_warn - if params["max_states"]: + if params.get("max_states"): max_warn, max_crit = params["max_states"] if found >= max_crit: state = max(state, 2)

11 years, 2 months

Check_MK Git: check_mk: windows: dynamically grows local/ plugin script output buffer

by Andreas Boesl

Module: check_mk Branch: master Commit: cee1485f85bdf1ec0893695a5964c53be53c509d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cee1485f85bdf1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 1 14:59:28 2013 +0200 windows: dynamically grows local/plugin script output buffer --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 32 ++++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bb1839..f9497af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ new script parameters cache_age, retry_count, timeout new script caching options "off", "async", "sync" * windows_agent: increased maximum local/plugin script output length to 512kB + (output buffer now grows dynamically) Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d585675..da4be44 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -103,7 +103,8 @@ // Maximum heap buffer for a single local/plugin script // This buffer contains the check output -#define SCRIPT_BUFFER_HEAP 524288L +#define HEAP_BUFFER_DEFAULT 16384L +#define HEAP_BUFFER_MAX 524288L // Maximum timeout for a single local/plugin script #define DEFAULT_PLUGIN_TIMEOUT 60 @@ -2266,6 +2267,9 @@ int launch_program(script_container* cont) time_t process_start = time(0); bool buffer_full = false; + cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HEAP_BUFFER_DEFAULT); + unsigned long current_heap_size = HeapSize(GetProcessHeap(), 0, cont->buffer_work); + for(;;) { if (cont->should_terminate || time(0) - process_start > cont->timeout){ @@ -2278,19 +2282,32 @@ int launch_program(script_container* cont) if (avail == 0) break; - if (out_offset + bread > SCRIPT_BUFFER_HEAP) { - buffer_full = true; - break; + while (out_offset + bread > current_heap_size) { + // Increase heap buffer + if (current_heap_size * 2 <= HEAP_BUFFER_MAX) { + cont->buffer_work = (char *) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + cont->buffer_work, current_heap_size * 2); + current_heap_size = HeapSize(GetProcessHeap(), 0, cont->buffer_work); + } + else { + buffer_full = true; + break; + } } + if (buffer_full) + break; if (bread > 0) { memset(buf, 0, sizeof(buf)); ReadFile(read_stdout, buf, sizeof(buf), &bread, NULL); - out_offset += snprintf(cont->buffer_work + out_offset, SCRIPT_BUFFER_HEAP - out_offset, buf); + out_offset += snprintf(cont->buffer_work + out_offset, current_heap_size - out_offset, buf); } } - if (buffer_full) + if (buffer_full) { + // Buffer full -> delete incomplete data + exit_code = 1; break; + } if (exit != STILL_ACTIVE) break; @@ -2312,7 +2329,6 @@ int launch_program(script_container* cont) DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) { script_container* cont = (script_container*) lpParam; - cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP + 1 ); // Execute script int result = launch_program(cont); @@ -3574,7 +3590,7 @@ void listen_tcp_loop() void output(SOCKET &out, const char *format, ...) { - static char outbuffer[SCRIPT_BUFFER_HEAP]; + static char outbuffer[HEAP_BUFFER_MAX]; // won't get any bigger... static int len = 0; va_list ap; va_start(ap, format);

11 years, 2 months

Check_MK Git: check_mk: Fixed distributed WATO site login

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f988a190ece9d50c3e1e044e1ba6847288d280b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f988a190ece9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 1 14:08:48 2013 +0200 Fixed distributed WATO site login --- web/htdocs/wato.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8763e3f..c0da639 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7097,7 +7097,7 @@ def do_site_login(site_id, name, password): # Trying basic auth AND form based auth to ensure the site login works. # Adding _ajaxid makes the web service fail silently with an HTTP code and # not output HTML code for an error screen. - url = site["multisiteurl"] + 'automation_login.py?_login=1' \ + url = site["multisiteurl"] + 'login.py?_login=1' \ '&_username=%s&_password=%s&_origtarget=automation_login.py&_plain_error=1' % \ (name, password) response = get_url(url, site.get('insecure', False), name, password).strip() @@ -7128,7 +7128,9 @@ def get_url(url, insecure, user=None, password=None, params = '', post_data = No # -s: silent # -S: show errors # -w '%{http_code}': add the http status code to the end of the output - command = 'curl -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % ( + # -L: follow redirects + # -b /dev/null: handle cookies, but do not persist them + command = 'curl -b /dev/null -L -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % ( insecure, cred, params, url) tmp_file = None if post_data != None:

11 years, 2 months

Check_MK Git: check_mk: windows_agent: increased maximum local/

by Andreas Boesl

plugin script output length to 512kB Message-ID: <51fa4f84.idH2x7POOf2udWwr%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8ca183b0d9f08a9420550b38759aa43094269f4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ca183b0d9f08a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 1 14:07:29 2013 +0200 windows_agent: increased maximum local/plugin script output length to 512kB --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 42 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index a179514..2bb1839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * windows_agent: now starts local/plugin scripts in separate threads/processes new script parameters cache_age, retry_count, timeout new script caching options "off", "async", "sync" + * windows_agent: increased maximum local/plugin script output length to 512kB Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 16773bf..d585675 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -103,7 +103,7 @@ // Maximum heap buffer for a single local/plugin script // This buffer contains the check output -#define SCRIPT_BUFFER_HEAP 524288 +#define SCRIPT_BUFFER_HEAP 524288L // Maximum timeout for a single local/plugin script #define DEFAULT_PLUGIN_TIMEOUT 60 @@ -2211,8 +2211,7 @@ int launch_program(script_container* cont) { int exit_code = 0; int out_offset = 0; - char buf[1024]; // i/o buffer - unsigned int buf_size = sizeof(buf); + char buf[16635]; // i/o buffer STARTUPINFO si; SECURITY_ATTRIBUTES sa; @@ -2265,37 +2264,38 @@ int launch_program(script_container* cont) memset(buf, 0, sizeof(buf)); time_t process_start = time(0); + bool buffer_full = false; + for(;;) { if (cont->should_terminate || time(0) - process_start > cont->timeout){ exit_code = 2; break; } - GetExitCodeProcess(pi.hProcess,&exit); // while the process is running - PeekNamedPipe(read_stdout,buf,buf_size - 1,&bread,&avail,NULL); - // check to see if there is any data to read from stdout - if (bread != 0) { - memset(buf, 0, sizeof(buf)); - if (avail > buf_size - 1) { - while (bread >= buf_size - 1) { - ReadFile(read_stdout,buf,buf_size - 1,&bread,NULL); // read the stdout pipe - out_offset += snprintf(cont->buffer_work + out_offset, SCRIPT_BUFFER_HEAP - out_offset, buf); - memset(buf, 0, sizeof(buf)); - } + GetExitCodeProcess(pi.hProcess, &exit); // while the process is running + while (!buffer_full) { + PeekNamedPipe(read_stdout, buf, sizeof(buf), &bread, &avail, NULL); + if (avail == 0) + break; + + if (out_offset + bread > SCRIPT_BUFFER_HEAP) { + buffer_full = true; + break; } - else { - ReadFile(read_stdout,buf,buf_size - 1,&bread,NULL); + + if (bread > 0) { + memset(buf, 0, sizeof(buf)); + ReadFile(read_stdout, buf, sizeof(buf), &bread, NULL); out_offset += snprintf(cont->buffer_work + out_offset, SCRIPT_BUFFER_HEAP - out_offset, buf); } } - - if (out_offset >= SCRIPT_BUFFER_HEAP) + if (buffer_full) break; if (exit != STILL_ACTIVE) break; - Sleep(50); + Sleep(10); } TerminateJobObject(cont->job_object, exit_code); @@ -2312,7 +2312,7 @@ int launch_program(script_container* cont) DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) { script_container* cont = (script_container*) lpParam; - cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP + 1); + cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP + 1 ); // Execute script int result = launch_program(cont); @@ -3574,7 +3574,7 @@ void listen_tcp_loop() void output(SOCKET &out, const char *format, ...) { - static char outbuffer[16384]; + static char outbuffer[SCRIPT_BUFFER_HEAP]; static int len = 0; va_list ap; va_start(ap, format);

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits