Fix the "no feed hosts" check and add a shelltest for the behavior.

[dead/htsn.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 0a2f7d7473482d624935cccc931600c39494aa4c..aebf5c503aa53f413100243900aee69b939e3c99 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -122,8 +122,8 @@ loop !cfg !h !buffer = do
     -- If we haven't received anything in fifteen minutes, return back
     -- to the calling function. This should only happen in the case of
     -- an error, and our caller should be prepared to handle it.
-    Nothing -> do
-      report_warning $ "No data received for 15 minutes."
+    Nothing -> report_warning "No data received for 15 minutes."
+
     Just line -> do
       -- If the recv didn't timeout, proceed normally.
       let new_buffer = line : buffer
@@ -225,7 +225,7 @@ log_in cfg h = do
 connect_and_parse :: Configuration
                   -> String -- ^ Hostname to connect to
                   -> IO ()
-connect_and_parse cfg host = do
+connect_and_parse cfg host =
   bracket acquire_handle release_handle action
   where
     five_seconds :: Int
@@ -235,7 +235,7 @@ connect_and_parse cfg host = do
       report_info $ "Connecting to " ++ host ++ "."
       connectTo host (PortNumber 4500)
 
-    release_handle = \h -> do
+    release_handle h = do
       report_info $ "Closing connection to " ++ host ++ "."
       hClose h
 
@@ -297,15 +297,7 @@ main = do
   let cfg = (def :: Configuration) `merge_optional` opt_config
   init_logging (log_level cfg) (log_file cfg) (syslog cfg)
 
-  -- Check the optional config for missing required options. This is
-  -- necessary because if the user specifies an empty list of
-  -- hostnames in e.g. the config file, we want to bail rather than
-  -- fall back on the default list (which was merged from a default
-  -- Configuration above).
-  when (null $ get_feed_hosts (OC.feed_hosts opt_config)) $ do
-    report_error "No feed hosts supplied."
-    exitWith (ExitFailure exit_no_feed_hosts)
-
+  -- Check the optional config for missing required options.
   when (isNothing (OC.password opt_config)) $ do
     report_error "No password supplied."
     exitWith (ExitFailure exit_no_password)
@@ -314,6 +306,18 @@ main = do
     report_error "No username supplied."
     exitWith (ExitFailure exit_no_username)
 
+  -- This should be impossible. We had a choice to make: since the
+  -- command-line feed_hosts are usually not supplied, we don't want
+  -- to take the empty list supplied on the command-line and use
+  -- that. But that means that we need to do the same thing if the
+  -- user supplies an empty list in the config file. That "same thing"
+  -- is to use the default list. So, this should never be empty,
+  -- because if the optional config has no feed hosts, we use the
+  -- default list.
+  when (null $ get_feed_hosts (feed_hosts cfg)) $ do
+    report_error "No feed hosts supplied."
+    exitWith (ExitFailure exit_no_feed_hosts)
+
   when (daemonize cfg) $ do
     -- Old PID files can be left around after an unclean shutdown. We
     -- only care if we're running as a daemon.