← Back to branch summary

~ubuntu-dev/ubuntu/lucid/zabbix/lucid-201002110857

« back to all changes in this revision

Viewing changes to src/zabbix_server/poller/poller.c

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2008-06-04 09:22:37 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080604092237-zgwq7kmraj1oohoz
Tags: 1:1.4.5-1ubuntu1
https://launchpad.net/bugs/172775
* Merge from debian unstable, remaining changes: 
  + fixing missing pid directory in /var/run
* Added the same patch to debian/zabbix-server-{mysql,pgsql}.zabbix-server.init
  (LP: #172775)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/zabbix_server/poller/poller.c
45
45
 
46
46
        struct  sigaction phan;
47
47
 
48
 
        zabbix_log(LOG_LEVEL_DEBUG, "In get_value()");
 
48
        zabbix_log(LOG_LEVEL_DEBUG, "In get_value(key:%s)",
 
49
                item->key);
49
50
 
50
51
        phan.sa_handler = &child_signal_handler;
51
52
        sigemptyset(&phan.sa_mask);
312
313
        /* Do not stop when select is made by poller for unreachable hosts */
313
314
        while((row=DBfetch(result))&&(stop==0 || poller_type == ZBX_POLLER_TYPE_UNREACHABLE))
314
315
        {
 
316
                /* This code is just to avoid compilation warining about use of uninitialized result2 */
 
317
                result2 = result;
 
318
                /* */
 
319
 
315
320
                /* Poller for unreachable hosts */
316
321
                if(poller_type == ZBX_POLLER_TYPE_UNREACHABLE)
317
322
                {
506
511
 
507
512
void main_poller_loop(int type, int num)
508
513
{
 
514
        struct  sigaction phan;
509
515
        int     now;
510
516
        int     nextcheck,sleeptime;
511
517
 
513
519
                type,
514
520
                num);
515
521
 
 
522
        phan.sa_handler = child_signal_handler;
 
523
        sigemptyset(&phan.sa_mask);
 
524
        phan.sa_flags = 0;
 
525
        sigaction(SIGALRM, &phan, NULL);
 
526
 
516
527
        poller_type = type;
517
528
        poller_num = num;
518
529