/[monit]/monit/p.y
ViewVC logotype

Diff of /monit/p.y

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.211 by martinp, Fri Aug 5 11:21:18 2005 UTC revision 1.212 by martinp, Sun Aug 14 08:44:49 2005 UTC
# Line 168  Line 168 
168    static void  preparse();    static void  preparse();
169    static void  postparse();    static void  postparse();
170    static void  addservice(Service_T);    static void  addservice(Service_T);
171    static void  addmail(char *, Mail_T, Mail_T *, unsigned int);    static void  addmail(char *, Mail_T, Mail_T *, unsigned int, unsigned int);
172    static void  createservice(int, char *, char *, int (*)(Service_T));    static void  createservice(int, char *, char *, int (*)(Service_T));
173    static void  adddependant(char *);    static void  adddependant(char *);
174    static void  addport(Port_T);    static void  addport(Port_T);
# Line 238  Line 238 
238  %token SET LOGFILE FACILITY DAEMON SYSLOG MAILSERVER HTTPD ALLOW ADDRESS INIT  %token SET LOGFILE FACILITY DAEMON SYSLOG MAILSERVER HTTPD ALLOW ADDRESS INIT
239  %token READONLY CLEARTEXT MD5HASH SHA1HASH CRYPT  %token READONLY CLEARTEXT MD5HASH SHA1HASH CRYPT
240  %token PEMFILE ENABLE DISABLE HTTPDSSL CLIENTPEMFILE ALLOWSELFCERTIFICATION  %token PEMFILE ENABLE DISABLE HTTPDSSL CLIENTPEMFILE ALLOWSELFCERTIFICATION
241  %token STATEFILE SEND EXPECT CYCLE COUNT  %token STATEFILE SEND EXPECT CYCLE COUNT REMINDER
242  %token PIDFILE START STOP PATHTOK  %token PIDFILE START STOP PATHTOK
243  %token HOST PORT TYPE UDP TCP TCPSSL PROTOCOL CONNECTION  %token HOST PORT TYPE UDP TCP TCPSSL PROTOCOL CONNECTION
244  %token ALERT MAILFORMAT UNIXSOCKET SIGNATURE  %token ALERT MAILFORMAT UNIXSOCKET SIGNATURE
# Line 387  opthost         : start Line 387  opthost         : start
387                  | depend                  | depend
388                  ;                  ;
389    
390  setalert        : SET alertmail '{' eventoptionlist '}' formatlist {  setalert        : SET alertmail '{' eventoptionlist '}' formatlist reminder {
391                     addmail($<string>2, &mailset, &Run.maillist, eventset);                     addmail($<string>2, &mailset, &Run.maillist, eventset, $<number>5);
392                   }                   }
393                  | SET alertmail formatlist {                  | SET alertmail formatlist reminder {
394                     addmail($<string>2, &mailset, &Run.maillist, eventset);                     addmail($<string>2, &mailset, &Run.maillist, eventset, $<number>4);
395                   }                   }
396                  ;                  ;
397    
# Line 959  urloperator     : EQUAL    { $<number>$= Line 959  urloperator     : EQUAL    { $<number>$=
959                  | NOTEQUAL { $<number>$= OPERATOR_NOTEQUAL; }                  | NOTEQUAL { $<number>$= OPERATOR_NOTEQUAL; }
960                  ;                  ;
961    
962  alert           : alertmail '{' eventoptionlist '}' formatlist {  alert           : alertmail '{' eventoptionlist '}' formatlist reminder {
963                     addmail($<string>1, &mailset, &current->maillist, eventset);                     addmail($<string>1, &mailset, &current->maillist, eventset, $<number>4);
964                   }                   }
965                  | alertmail formatlist {                  | alertmail formatlist reminder {
966                     addmail($<string>1, &mailset, &current->maillist, eventset);                     addmail($<string>1, &mailset, &current->maillist, eventset, $<number>3);
967                   }                   }
968                  ;                  ;
969    
# Line 1348  gid             : IF FAILED GID STRING T Line 1348  gid             : IF FAILED GID STRING T
1348  icmptype        : TYPE ICMPECHO { $<number>$= ICMP_ECHO; }  icmptype        : TYPE ICMPECHO { $<number>$= ICMP_ECHO; }
1349                  ;                  ;
1350    
1351    reminder        : /* EMPTY */           { $<number>$ = 0; }
1352                    | REMINDER NUMBER       { $<number>$ = $2; }
1353                    | REMINDER NUMBER CYCLE { $<number>$ = $2; }
1354                    ;
1355    
1356  %%  %%
1357    
1358    
# Line 1681  static void adddependant(char *dependant Line 1686  static void adddependant(char *dependant
1686   * Add the given mailaddress with the apropriate alert notification   * Add the given mailaddress with the apropriate alert notification
1687   * values and mail attributes to the given mailinglist.   * values and mail attributes to the given mailinglist.
1688   */   */
1689  static void addmail(char *mailto, Mail_T f, Mail_T *l, unsigned int events) {  static void addmail(char *mailto, Mail_T f, Mail_T *l, unsigned int events, unsigned int reminder) {
1690    
1691    Mail_T m;    Mail_T m;
1692    
# Line 1699  static void addmail(char *mailto, Mail_T Line 1704  static void addmail(char *mailto, Mail_T
1704    m->from= f->from;    m->from= f->from;
1705    m->subject= f->subject;    m->subject= f->subject;
1706    m->message= f->message;    m->message= f->message;
1707      m->reminder= reminder;
1708        
1709    m->next= *l;    m->next= *l;
1710    *l= m;    *l= m;
# Line 2805  static void setsyslog(char *facility) { Line 2811  static void setsyslog(char *facility) {
2811    
2812    
2813  /*  /*
2814   * Reset the current mailset and eventset for reuse   * Reset the current mailset, eventset and reminder for reuse
2815   */   */
2816  static void reset_mailset() {  static void reset_mailset() {
2817    memset(&mailset, 0, sizeof(struct mymail));    memset(&mailset, 0, sizeof(struct mymail));

Legend:
Removed from v.1.211  
changed lines
  Added in v.1.212

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26