← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/zabbix_server/trapper/trapper.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/trapper/trapper.c
182
182
        gettimeofday(&tv, NULL);
183
183
        msec = tv.tv_usec;*/
184
184
 
185
 
/*      alarm(CONFIG_TIMEOUT);*/
 
185
        alarm(ZABBIX_TRAPPER_TIMEOUT);
186
186
 
187
187
        if(zbx_tcp_recv(sock, &data) != SUCCEED)
188
188
        {
189
 
/*              alarm(0);*/
 
189
                alarm(0);
190
190
                return;
191
191
        }
192
192
 
193
193
        process_trap(sock, data, sizeof(data));
194
 
/*      alarm(0);*/
 
194
        alarm(0);
195
195
 
196
196
/*      gettimeofday(&tv, NULL);
197
197
        zabbix_log( LOG_LEVEL_DEBUG, "Trap processed in " ZBX_FS_DBL " seconds",
200
200
 
201
201
void    child_trapper_main(int i, zbx_sock_t *s)
202
202
{
 
203
        struct  sigaction phan;
 
204
 
203
205
        zabbix_log( LOG_LEVEL_DEBUG, "In child_trapper_main()");
204
206
 
205
207
        zabbix_log( LOG_LEVEL_WARNING, "server #%d started [Trapper]", i);
206
208
 
 
209
        phan.sa_handler = child_signal_handler;
 
210
        sigemptyset(&phan.sa_mask);
 
211
        phan.sa_flags = 0;
 
212
        sigaction(SIGALRM, &phan, NULL);
 
213
 
207
214
        DBconnect(ZBX_DB_CONNECT_NORMAL);
208
215
 
209
216
        for(;;)