Changeset 180cd15

Timestamp:

Jan 4, 2005, 11:29:48 PM (19 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

176d3443

Parents:

15b34fd

Message:

Now deals with the special case of logging failed zwrites correctly

Files:

• logging.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)

logging.c

@@ -126 +126 @@
   FILE *file;
   char filename[MAXPATHLEN], *logpath;
-  char *tobuff;
-
+  char *tobuff, *zwriteline;
+  owl_message *m;
+
+  /* create a present message so we can pass it to
+   * owl_log_shouldlog_message()
+   */
+  zwriteline=owl_sprintf("zwrite %s", to);
+  m=owl_function_make_outgoing_zephyr(text, zwriteline, "");
+  owl_free(zwriteline);
+  if (!owl_log_shouldlog_message(m)) {
+    owl_message_free(m);
+    return;
+  }
+  owl_message_free(m);
+
+  /* chop off a local realm */
   tobuff=short_zuser(to);
 

zephyr.c

@@ -480 +480 @@
       char buff[1024];
       tmp = short_zuser(retnotice->z_recipient);
-      owl_function_error("%s: Not logged in or subscribing to messages.", 
-                           tmp);
-
+      owl_function_error("%s: Not logged in or subscribing to messages.", tmp);
       sprintf(buff, "Could not send message to %s: not logged in or subscribing to messages.\n", tmp);
       owl_function_adminmsg("", buff);
-      if (owl_global_is_logging(&g)) owl_log_outgoing_zephyr_error(tmp, buff);
+      owl_log_outgoing_zephyr_error(tmp, buff);
       owl_free(tmp);
     }