make pdnsOut more composable

diff --git a/PowerDns.hs b/PowerDns.hs
index cb685dd4e96fadfb9e83359568365e46c5d7ddde..165b80ed5303681b0c63c0e82f8a2b36b1371ca4 100644 (file)
--- a/PowerDns.hs
+++ b/PowerDns.hs
@@ -63,5 +63,8 @@ pdnsParse ver s =
                                             })
       _                         -> Left $ "Unparseable PDNS Request: " ++ s
 
                                             })
       _                         -> Left $ "Unparseable PDNS Request: " ++ s
 

-pdnsOut :: RRType -> NmcDom -> String
-pdnsOut _ d = show d
+pdnsOut :: Int -> RRType -> Either String NmcDom -> String
+pdnsOut ver _ d =
+  case d of
+    Left  err -> "LOG Error: " ++ err ++ "\nFAIL\n"
+    Right dom -> "DATA\n" ++ (show dom) ++ "\nEND\n" --FIXME

diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs
index a3fc8c7c5b2a5a414388c4f4ede60d1f6c94e1a5..b010bac1cfd9ebfa0472eec64c3e68ca2c1317fe 100644 (file)
--- a/pdns-pipe-nmc.hs
+++ b/pdns-pipe-nmc.hs
@@ -5,7 +5,7 @@ module Main where
 import Control.Monad
 import qualified Data.ByteString.Char8 as C (pack, unpack)
 import qualified Data.ByteString.Lazy.Char8 as L (pack, unpack)
 import Control.Monad
 import qualified Data.ByteString.Char8 as C (pack, unpack)
 import qualified Data.ByteString.Lazy.Char8 as L (pack, unpack)

-import Data.ByteString.Lazy as BS hiding (reverse, putStrLn)
+import Data.ByteString.Lazy as BS hiding (reverse, putStr, putStrLn)

 import Data.List.Split
 import Data.Aeson (encode, decode, Value(..))
 import Network.HTTP.Types
 import Data.List.Split
 import Data.Aeson (encode, decode, Value(..))
 import Network.HTTP.Types


@@ -55,6 +55,8 @@ qRsp rsp =
 
 -- NMC interface
 
 
 -- NMC interface
 

+descend subdom dom = dom
+

 queryNmc :: Manager -> Config -> String -> String
          -> IO (Either String NmcDom)
 queryNmc mgr cfg fqdn qid = do
 queryNmc :: Manager -> Config -> String -> String
          -> IO (Either String NmcDom)
 queryNmc mgr cfg fqdn qid = do


@@ -62,7 +64,9 @@ queryNmc mgr cfg fqdn qid = do
     "bit":dn:xs -> do
       rsp <- runResourceT $
              httpLbs (qReq cfg (L.pack ("d/" ++ dn)) (L.pack qid)) mgr
     "bit":dn:xs -> do
       rsp <- runResourceT $
              httpLbs (qReq cfg (L.pack ("d/" ++ dn)) (L.pack qid)) mgr

-      return $ qRsp rsp
+      return $ case qRsp rsp of
+        Left  err -> Left err
+        Right dom -> Right $ descend xs dom

     _           ->
       return $ Left "Only \".bit\" domain is supported"
 
     _           ->
       return $ Left "Only \".bit\" domain is supported"
 


@@ -92,24 +96,18 @@ main = do
   forever $ do
     l <- getLine
     case pdnsParse ver l of
   forever $ do
     l <- getLine
     case pdnsParse ver l of

-      Left e -> putStrLn $ "ERROR\t" ++ e
+      Left e -> putStrLn $ "FAIL\t" ++ e

       Right preq -> do
         case preq of
       Right preq -> do
         case preq of

-          PdnsRequestQ qname qtype id _ _ _ -> do
-            ncres <- queryNmc mgr cfg qname id
-            case ncres of
-              Left  e   -> putStrLn $ "ERROR\t" ++ e
-              Right dom -> putStrLn $ pdnsOut qtype dom
+          PdnsRequestQ qname qtype id _ _ _ ->
+            queryNmc mgr cfg qname id >>= putStr . (pdnsOut ver qtype)

           PdnsRequestAXFR xfrreq ->
           PdnsRequestAXFR xfrreq ->

-            putStrLn ("ERROR\tNo support for AXFR " ++ xfrreq)
-          PdnsRequestPing -> putStrLn "OK"
+            putStrLn ("FAIL\tNo support for AXFR " ++ xfrreq)
+          PdnsRequestPing -> putStrLn "END"

 
 -- for testing
 
 ask str = do
   cfg <- readConfig confFile
   mgr <- newManager def
 
 -- for testing
 
 ask str = do
   cfg <- readConfig confFile
   mgr <- newManager def

-  ncres <- queryNmc mgr cfg str "test-req-id"
-  case ncres of
-    Left  e   -> putStrLn $ "ERROR\t" ++ e
-    Right dom -> putStrLn $ pdnsOut RRTypeANY dom
+  queryNmc mgr cfg str "test-req-id" >>= putStr . (pdnsOut 1 RRTypeANY)