X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FConfiguration.hs;h=6234821c698f9de444101c5dd210a6a28db15223;hb=52e788e676ea2a67ad20b23d2e5c5b351f27b834;hp=7b237c5f1d0d350de28b8d00bc711fabcc78ee2c;hpb=a2c2a1a6865be7b4cd17fb72de635bb9385728b9;p=dead%2Fhtsn.git

diff --git a/src/Configuration.hs b/src/Configuration.hs
index 7b237c5..6234821 100644
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -7,7 +7,8 @@ module Configuration (
   merge_optional )
 where
 
-import System.Console.CmdArgs.Default (Default(..))
+import System.Console.CmdArgs.Default ( Default(..) )
+import System.Log ( Priority( INFO ) )
 
 import qualified OptionalConfiguration as OC (OptionalConfiguration(..))
 import TSN.FeedHosts (FeedHosts(..))
@@ -15,15 +16,18 @@ import TSN.FeedHosts (FeedHosts(..))
 data Configuration =
   Configuration {
     feed_hosts       :: FeedHosts,
+    log_file         :: FilePath,
+    log_level        :: Priority,
     password         :: String,
     output_directory :: FilePath,
+    syslog           :: Bool,
     username         :: String }
     deriving (Show)
 
 -- | A Configuration with all of its fields set to their default
 --   values.
 instance Default Configuration where
-  def = Configuration def def "." def
+  def = Configuration def "htsn.log" INFO def "." True def
 
 
 -- | Merge a Configuration with an OptionalConfiguration. This is more
@@ -35,8 +39,11 @@ merge_optional :: Configuration
 merge_optional cfg opt_cfg =
   Configuration
     all_feed_hosts
+    (merge (log_file cfg) (OC.log_file opt_cfg))
+    (merge (log_level cfg) (OC.log_level opt_cfg))
     (merge (password cfg) (OC.password opt_cfg))
     (merge (output_directory cfg) (OC.output_directory opt_cfg))
+    (merge (syslog cfg) (OC.syslog opt_cfg))
     (merge (username cfg) (OC.username opt_cfg))
   where
     merge :: a -> Maybe a -> a