diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2003-07-20 18:15:21 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2003-07-20 18:15:21 +0000 |
| commit | edb44e0293222987bcbaf6409c021c767c6faeec (patch) | |
| tree | baee5dd84d6b408971e24c1ba72e6ec6bb2411bb /include | |
| parent | 960f15d24df774d5853ad8e8cbcaf81f0c61d56d (diff) | |
| download | zabbix-edb44e0293222987bcbaf6409c021c767c6faeec.tar.gz zabbix-edb44e0293222987bcbaf6409c021c767c6faeec.tar.xz zabbix-edb44e0293222987bcbaf6409c021c767c6faeec.zip | |
- support for changing of graph items (Alexei)
- menu will not require more than three lines (Alexei)
- fixed dividion by zero in chart2.php (Alexei)
- period and start of interval are preserved in full-screen mode (Alexei)
- added units in graph legends (Alexei)
- table-like legend for user graphs (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@853 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/db.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/db.c b/include/db.c index 31aaae58..f33ceacf 100644 --- a/include/db.c +++ b/include/db.c @@ -785,10 +785,12 @@ int DBget_queue_count(void) int res; char sql[MAX_STRING_LEN+1]; DB_RESULT *result; + int now; zabbix_log(LOG_LEVEL_DEBUG,"In DBget_queue_count()"); - sprintf(sql,"select count(*) from items i,hosts h where i.status=%d and i.type not in (%d) and h.status=%d and i.hostid=h.hostid and i.nextcheck<$now and i.key_<>'status'", ITEM_STATUS_ACTIVE, ITEM_TYPE_TRAPPER, HOST_STATUS_MONITORED); + now=time(NULL); + sprintf(sql,"select count(*) from items i,hosts h where i.status=%d and i.type not in (%d) and h.status=%d and i.hostid=h.hostid and i.nextcheck<%d and i.key_<>'status'", ITEM_STATUS_ACTIVE, ITEM_TYPE_TRAPPER, HOST_STATUS_MONITORED, now); result=DBselect(sql); |