From: <st...@us...> - 2012-06-02 09:33:46
|
Revision: 7011 http://xymon.svn.sourceforge.net/xymon/?rev=7011&view=rev Author: storner Date: 2012-06-02 09:33:40 +0000 (Sat, 02 Jun 2012) Log Message: ----------- xymonnet: Fetch interval setting from database and report in standard millisecond format. Modified Paths: -------------- trunk/xymonnet/netmodule.c trunk/xymonnet/netsql.c trunk/xymonnet/sendresults.c Modified: trunk/xymonnet/netmodule.c =================================================================== --- trunk/xymonnet/netmodule.c 2012-06-02 09:29:47 UTC (rev 7010) +++ trunk/xymonnet/netmodule.c 2012-06-02 09:33:40 UTC (rev 7011) @@ -653,6 +653,8 @@ int concurrency = 0; int batchsize = 0; + libxymon_init(argv[0]); + for (argi=1; (argi < argc); argi++) { if (strcmp(argv[argi], "ping") == 0) { queueid = argv[argi]; Modified: trunk/xymonnet/netsql.c =================================================================== --- trunk/xymonnet/netsql.c 2012-06-02 09:29:47 UTC (rev 7010) +++ trunk/xymonnet/netsql.c 2012-06-02 09:33:40 UTC (rev 7011) @@ -364,7 +364,7 @@ time_t now = getcurrenttime(NULL); if (!nettest_due_sql) { - dbres = sqlite3_prepare_v2(xymonsqldb, "select hostname,testspec,destination,testtype,sourceip,timeout from testtimes where location=LOWER(?) and (timestamp+interval)<?", -1, &nettest_due_sql, NULL); + dbres = sqlite3_prepare_v2(xymonsqldb, "select hostname,testspec,destination,testtype,sourceip,timeout,interval from testtimes where location=LOWER(?) and (timestamp+interval)<?", -1, &nettest_due_sql, NULL); if (dbres != SQLITE_OK) { errprintf("nettest_due prep failed: %s\n", sqlite3_errmsg(xymonsqldb)); return 0; @@ -388,6 +388,7 @@ srcip = sqlite3_column_text(nettest_due_sql, 4); options->sourceip = (!srcip || strlen(srcip) == 0) ? NULL : strdup(srcip); options->timeout = sqlite3_column_int(nettest_due_sql, 5); + options->interval = sqlite3_column_int(nettest_due_sql, 6); result = 1; } else { Modified: trunk/xymonnet/sendresults.c =================================================================== --- trunk/xymonnet/sendresults.c 2012-06-02 09:29:47 UTC (rev 7010) +++ trunk/xymonnet/sendresults.c 2012-06-02 09:33:40 UTC (rev 7011) @@ -257,10 +257,10 @@ snprintf(msgline, sizeof(msgline), "Status: %s\n", s); addtobuffer(hres->txt, msgline); - snprintf(msgline, sizeof(msgline), "ElapsedMS: %d.%02d\nDNSMS:%d.%02d\nTimeoutMS:%d\nIntervalMS:%d\n", + snprintf(msgline, sizeof(msgline), "ElapsedMS: %d.%02d\nDNSMS: %d.%02d\nTimeoutMS: %d\nIntervalMS: %d\n", (rec->elapsedus / 1000), (rec->elapsedus % 1000), (rec->dnselapsedus / 1000), (rec->dnselapsedus % 1000), - rec->timeout*1000, rec->intervalMS); + rec->timeout*1000, rec->interval*1000); addtobuffer(hres->txt, msgline); snprintf(msgline, sizeof(msgline), "BytesRead: %u\nBytesWritten: %u\n", rec->bytesread, rec->byteswritten); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |