[srvx-commits] CVS: services/src helpserv.c,1.66,1.67

[Adrian D. <sai...@us...>]

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

Modified Files:
	helpserv.c 
Log Message:
List the total number of requests waiting when whining (featreq #731618)


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** helpserv.c	24 May 2003 14:48:16 -0000	1.66
--- helpserv.c	2 Jun 2003 01:32:10 -0000	1.67
***************
*** 200,204 ****
  #define HSMSG_PAGE_ASSIGN_REQUEST "Request ID#%lu from $b%s$b (Account %s) has been assigned to %s."
  #define HSMSG_PAGE_HELPER_GONE   "Request ID#%lu from $b%s$b (Account %s) $bhas been unassigned$b, as its helper, %s has %s."
! #define HSMSG_PAGE_WHINE_HEADER  "$b%u unhandled request%s$b waiting at least $b%s$b"
  #define HSMSG_PAGE_IDLE_HEADER   "$b%u users$b in %s $bidle at least %s$b:"
  #define HSMSG_PAGE_EMPTYALERT    "$b%s has no helpers present$b"
--- 200,204 ----
  #define HSMSG_PAGE_ASSIGN_REQUEST "Request ID#%lu from $b%s$b (Account %s) has been assigned to %s."
  #define HSMSG_PAGE_HELPER_GONE   "Request ID#%lu from $b%s$b (Account %s) $bhas been unassigned$b, as its helper, %s has %s."
! #define HSMSG_PAGE_WHINE_HEADER  "$b%u unhandled request%s$b waiting at least $b%s$b (%u total)"
  #define HSMSG_PAGE_IDLE_HEADER   "$b%u users$b in %s $bidle at least %s$b:"
  #define HSMSG_PAGE_EMPTYALERT    "$b%s has no helpers present$b"
***************
*** 2170,2177 ****
--- 2170,2179 ----
          struct helpserv_request *unh;
          struct helpserv_reqlist reqlist;
+         unsigned int queuesize=0;
  
          helpserv_reqlist_init(&reqlist);
  
          for (unh = hs->unhandled; unh; unh = unh->next_unhandled) {
+             queuesize++;
              if ((now - unh->opened) >= TIME_T_CAST hs->intervals[INTERVAL_WHINE_DELAY]) {
                  helpserv_reqlist_append(&reqlist, unh);
***************
*** 2207,2211 ****
              }
  
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? "" : "s"), strwhinedelay);
              table_send(hs->helpserv, hs->page_targets[PGSRC_ALERT]->name, 0, page_type_funcs[hs->page_types[PGSRC_ALERT]], tbl);
  
--- 2209,2213 ----
              }
  
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? "" : "s"), strwhinedelay, queuesize);
              table_send(hs->helpserv, hs->page_targets[PGSRC_ALERT]->name, 0, page_type_funcs[hs->page_types[PGSRC_ALERT]], tbl);
  
***************
*** 2215,2219 ****
              }
  #else
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? "" : "s"), strwhinedelay);
  #endif
          }
--- 2217,2221 ----
              }
  #else
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? "" : "s"), strwhinedelay, queuesize);
  #endif
          }