[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit f2ae2a534f80c89ffb65cebfcafad86095bf4f05
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Oct 8 03:45:53 2004 +0100

    Fixed handling of options in syslog handler
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-49)

diff --git a/ChangeLog b/ChangeLog
index 329443f..5fb5bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
 #
 
+2004-10-07 21:45:53 GMT	John Goerzen <jgoerzen at complete.org>	patch-49
+
+    Summary:
+      Fixed handling of options in syslog handler
+    Revision:
+      missingh--head--1.0--patch-49
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Logging/Handler/Syslog.hs
+
+
 2004-10-07 21:28:13 GMT	John Goerzen <jgoerzen at complete.org>	patch-48
 
     Summary:
diff --git a/libsrc/MissingH/Logging/Handler/Syslog.hs b/libsrc/MissingH/Logging/Handler/Syslog.hs
index 6e4a1c6..4f6f3da 100644
--- a/libsrc/MissingH/Logging/Handler/Syslog.hs
+++ b/libsrc/MissingH/Logging/Handler/Syslog.hs
@@ -37,6 +37,7 @@ import Network.Socket
 import Network.BSD
 import List
 import System.Posix.Process(getProcessID)
+import IO
 
 code_of_pri :: Priority -> Int
 code_of_pri p = case p of
@@ -168,8 +169,11 @@ instance LogHandler SyslogHandler where
             do
             pidstr <- getpid
             let outstr = "<" ++ (show code) ++ ">" 
-                         ++ (identity sh) ++ pidstr ++ ": " ++ msg ++ "\0"
-            sendstr outstr
+                         ++ (identity sh) ++ pidstr ++ ": " ++ msg
+            if (elem PERROR (options sh))
+               then hPutStrLn stderr outstr
+               else return ()
+            sendstr (outstr ++ "\0")
             return ()
     close sh = sClose (logsocket sh)
 

-- 
haskell-testpack