Lisää komento palvelimen tilan tulostamiseen

src/Main.hs

@@ -30,6 +30,7 @@ import TiedoteMD.Review
 import TiedoteMD.Send
 import TiedoteMD.State
 import TiedoteMD.Types
+import TiedoteMD.Debug
 
 serverMain :: SockAddr -> Mailbox -> FilePath -> FilePath -> IO ()
 serverMain socket mail repoPath sendmailPath = do
@@ -50,8 +51,15 @@ clientMain socket mail sendmailPath = do
         `onException` exitWith codeTempFail
     manageIncomingEmail acid mail sendmailPath
 
+printStateMain :: SockAddr -> IO ()
+printStateMain socket = do
+    acid <- openRemoteStateSockAddr skipAuthenticationPerform socket
+        `onException` openLocalState emptyState
+        `onException` exitWith codeTempFail
+    printState acid
+
 data Config = Config { socketPath :: FilePath, mail :: Mailbox, sendmailCommand :: String, runMode :: RunMode } deriving Show
-data RunMode = Server { repoPath :: FilePath } | Recieve deriving Show
+data RunMode = Server { repoPath :: FilePath } | Recieve | Print deriving Show
 
 config :: Maybe Mailbox -> Parser Config
 config mail = Config
@@ -59,7 +67,8 @@ config mail = Config
     <*> option readMailbox (long "address" <> short 'a' <> metavar "EMAIL" <> maybe mempty value mail <> help "Email address to send and recieve mail")
     <*> strOption (long "sendmail" <> short 'm' <> metavar "FILE" <> value "sendmail" <> help "Sendmail command")
     <*> hsubparser (command "server" (info serverCommand (progDesc "Run the server"))
-        <> command "recieve" (info (pure Recieve) (progDesc "Recieve an email")))
+        <> command "recieve" (info (pure Recieve) (progDesc "Recieve an email"))
+        <> command "state" (info (pure Print) (progDesc "Print the server's current state")))
 
 serverCommand :: Parser RunMode
 serverCommand = Server <$> strOption (long "repository" <> short 'r' <> metavar "DIRECTORY" <> value "/var/lib/tiedote.md/git-repo" <> showDefault <> help "Path to git repository")
@@ -78,4 +87,5 @@ main = do
         findExecutable (sendmailCommand args)
     case args of
       Config {runMode = Recieve, ..} -> clientMain (SockAddrUnix socketPath) mail sendmailPath
+      Config {runMode = Print, ..} -> printStateMain (SockAddrUnix socketPath)
       Config {runMode = Server {..}, ..} -> serverMain (SockAddrUnix socketPath) mail repoPath sendmailPath

src/TiedoteMD/Debug.hs

@@ -0,0 +1,8 @@
+module TiedoteMD.Debug where
+
+import Data.Acid (AcidState, query)
+
+import TiedoteMD.State
+
+printState :: AcidState State -> IO ()
+printState acid = query acid GetState >>= print

tiedote-md.cabal

@@ -55,6 +55,7 @@ executable tiedote.md
     utf8-string
   main-is: Main.hs
   other-modules:
+    TiedoteMD.Debug
     TiedoteMD.Git
     TiedoteMD.Read
     TiedoteMD.Review