Changeset 272 for trunk/src/sh_error.c

Timestamp:

Jan 27, 2010, 10:52:20 PM (15 years ago)

Author:

katerina

Message:

Fixes tickets #190, #191, #192, #193, and #194.

File:

• trunk/src/sh_error.c (modified) (1 diff)

trunk/src/sh_error.c

@@ -1332 +1332 @@
 /*@i@*/}
 
+#if defined(SH_WITH_MAIL)
+void sh_error_mail (const char * alias, int sev, 
+                    const char * file, long line, 
+                    long status, unsigned long msg_id, ...)
+{
+  va_list         vl;                 /* argument list          */
+  struct _log_t * lmsg;
+
+  int    severity;
+  unsigned int class;
+  char * fmt;
+  int retval; 
+
+  SL_ENTER(_("sh_error_mail"));
+
+  /* Returns pointer to (constant|thread-specific) static memory
+   */
+  fmt = /*@i@*/get_format (msg_id, &severity, &class);
+
+  if (!fmt)
+    {
+      SL_RET0(_("sh_error_mail"));
+    }
+
+  /* --- Override the catalogue severity. ---
+   */
+  if (sev != (-1))
+    severity = sev;
+
+  /* --- Build the message. ---
+   */
+  lmsg = (struct _log_t *) SH_ALLOC(sizeof(struct _log_t));
+  MLOCK( (char *) lmsg, sizeof(struct _log_t));
+  /*@i@*/lmsg->msg = NULL;
+
+  /*@i@*/(void) sl_strlcpy(lmsg->format, fmt, SH_PATHBUF);
+  (void) sl_strlcpy(lmsg->file, file, SH_PATHBUF);
+  lmsg->severity = severity;
+  lmsg->class    = (int) class;
+  lmsg->line     = line;
+  lmsg->status   = status;
+
+  /* Format the log message with timestamp etc.
+   * Allocate lmsg->msg
+   */
+  va_start (vl, msg_id);
+  (void) sh_error_string (lmsg, vl);
+  va_end (vl);
+
+  if ( (severity & SH_ERR_FATAL) == 0) 
+    retval = sh_nmail_pushstack (severity, lmsg->msg, alias);
+  else 
+    retval = sh_nmail_msg (severity, lmsg->msg, alias);
+  
+  if (retval == -2)
+    {
+      sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_QUEUE_FULL,
+                       _("email"));
+    }
+  SL_RET0(_("sh_error_mail"));
+}
+#else
+void sh_error_mail (const char * alias, int sev, 
+                    const char * file, long line, 
+                    long status, unsigned long msg_id, ...)
+{
+  (void) alias;
+  (void) sev;
+  (void) file;
+  (void) line;
+  (void) status;
+  (void) msg_id;
+
+  return;
+}
+/* defined(SH_WITH_MAIL) */
+#endif 
 
 /* -------------------------