From b7e6ea8fc716f07c7ab98e08a730c3db16ab97a4 Mon Sep 17 00:00:00 2001 From: sasha Date: Tue, 13 Nov 2007 13:36:05 +0000 Subject: - [NTT-46] TR-060 Can not get result of command execution [svn merge -r5000:5003 svn://svn.zabbix.com/branches/1.4.j] git-svn-id: svn://svn.zabbix.com/trunk@5005 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/scripts.inc.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'frontends/php/include/scripts.inc.php') diff --git a/frontends/php/include/scripts.inc.php b/frontends/php/include/scripts.inc.php index 33f6f1c1..b87749cd 100644 --- a/frontends/php/include/scripts.inc.php +++ b/frontends/php/include/scripts.inc.php @@ -74,14 +74,19 @@ function execute_script($scriptid,$hostid){ if($res) { global $ZBX_LOCALNODEID; - $res = false; - - $sql = "SELECT ip,port FROM nodes WHERE nodeid=$ZBX_LOCALNODEID"; - $node = DBselect($sql); - if($row = DBfetch($node)) + if($nodeid == 0) { - $res = socket_connect($socket, $row['ip'], $row['port']); + $res = socket_connect($socket, '127.0.0.1', 10051); + } + else + { + $sql = "SELECT ip,port FROM nodes WHERE nodeid=$ZBX_LOCALNODEID"; + $node = DBselect($sql); + if($row = DBfetch($node)) + { + $res = socket_connect($socket, $row['ip'], $row['port']); + } } } if($res) @@ -101,7 +106,8 @@ function execute_script($scriptid,$hostid){ } else { - $message = socket_strerror(socket_last_error()); + $message["flag"]=-1; + $message["message"] = socket_strerror(socket_last_error()); } return $message; } -- cgit