[srvx-commits] CVS: services/src log.c,1.65,1.66 opserv.help,1.67,1.68

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv538/src

Modified Files:
	log.c opserv.help 
Log Message:
fix ?LOG LEVEL <x> and document its corrected behavior


Index: log.c
===================================================================
RCS file: /cvsroot/srvx/services/src/log.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** log.c	22 Aug 2003 00:26:21 -0000	1.65
--- log.c	19 Oct 2003 15:32:51 -0000	1.66
***************
*** 227,233 ****
  {
      enum log_severity ls;
!     for (ls = 0; ls < LOG_NUM_SEVERITIES; ++ls) {
!         if (!irccasecmp(text, log_severity_names[ls])) return ls;
!     }
      return LOG_NUM_SEVERITIES;
  }
--- 227,233 ----
  {
      enum log_severity ls;
!     for (ls = 0; ls < LOG_NUM_SEVERITIES; ++ls)
!         if (!ircncasecmp(text, log_severity_names[ls], strlen(log_severity_names[ls])))
!             return ls;
      return LOG_NUM_SEVERITIES;
  }
***************
*** 653,682 ****
              discrim->limit = strtoul(argv[++ii], NULL, 10);
          } else if (!irccasecmp(argv[ii], "level")) {
!             enum log_severity sev;
!             if (!irccasecmp(argv[++ii], "*")) {
!                 discrim->severities ^= ~0;
!             } else {
!                 int add = 1;
!                 char *severity;
! 
!                 switch (*argv[ii]) {
!                 case '-':
!                     add = 0;
!                 case '+':
!                     argv[ii]++;
!                 default:
!                     severity = argv[ii];
!                 }
!                 sev = find_severity(severity);
                  if (sev == LOG_NUM_SEVERITIES) {
!                     send_message(user, service, MSG_INVALID_SEVERITY, argv[ii]);
                      goto fail;
-                 } else {
-                     if (add) {
-                         discrim->severities |= 1 << sev;
-                     } else {
-                         discrim->severities &= ~(1 << sev);
-                     }
                  }
              }
          } else if (!irccasecmp(argv[ii], "type")) {
--- 653,669 ----
              discrim->limit = strtoul(argv[++ii], NULL, 10);
          } else if (!irccasecmp(argv[ii], "level")) {
!             char *severity = argv[++ii];
!             discrim->severities = 0;
!             while (1) {
!                 enum log_severity sev = find_severity(severity);
                  if (sev == LOG_NUM_SEVERITIES) {
!                     send_message(user, service, MSG_INVALID_SEVERITY, severity);
                      goto fail;
                  }
+                 discrim->severities |= 1 << sev;
+                 severity = strchr(severity, ',');
+                 if (!severity)
+                     break;
+                 severity++;
              }
          } else if (!irccasecmp(argv[ii], "type")) {

Index: opserv.help
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.help,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** opserv.help	12 Oct 2003 03:35:51 -0000	1.67
--- opserv.help	19 Oct 2003 15:32:51 -0000	1.68
***************
*** 322,326 ****
          "$bAGE$b -         Age of commands to find (for example, 1m or >3m).",
          "$bLIMIT$b -       Maximum number of results to show.",
!         "$bLEVEL$b -       One of COMMAND, OVERRIDE, STAFF or *, to return only some results.",
          "$bTYPE$b -        Name of module that generated log (see $bSTATS MODULES$b).",
          "By default, all levels of audit log entries are returned. You may exclude levels from the results by using the level criteria and the '-' character in front of the level name.");
--- 322,326 ----
          "$bAGE$b -         Age of commands to find (for example, 1m or >3m).",
          "$bLIMIT$b -       Maximum number of results to show.",
!         "$bLEVEL$b -       Comma-separated list of COMMAND, OVERRIDE, STAFF, to return only those commands.",
          "$bTYPE$b -        Name of module that generated log (see $bSTATS MODULES$b).",
          "By default, all levels of audit log entries are returned. You may exclude levels from the results by using the level criteria and the '-' character in front of the level name.");