← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/zabbix_get/zabbix_get.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_get/zabbix_get.c
144
144
 
145
145
        *value = NULL;
146
146
 
147
 
        if( SUCCEED == (ret = zbx_tcp_connect(&s, host, port)) )
148
 
        {
 
147
        if (SUCCEED == (ret = zbx_tcp_connect(&s, host, port, SENDER_TIMEOUT))) {
149
148
                zbx_snprintf(request, sizeof(request),"%s\n",key);
150
149
                if( SUCCEED == (ret = zbx_tcp_send(&s, request)) )
151
150
                {
228
227
 
229
228
                signal( SIGQUIT, signal_handler );
230
229
                signal( SIGALRM, signal_handler );
231
 
 
232
 
                alarm(SENDER_TIMEOUT);
233
230
#endif /* not WINDOWS */
234
231
 
235
232
                ret = get_value(host, port, key, &value);
236
233
 
237
 
#if !defined(_WINDOWS)
238
 
                alarm(0);
239
 
#endif /* not WINDOWS */
240
 
 
241
234
                if(ret == SUCCEED)
242
235
                {
243
236
                        printf("%s\n",value);