iopq/proxy - Change J4YFZJCF4Q57B3EERJRZJM37QU2LADHAPOYSC7ZFRRUY65PI6LRAC

Error handling improved

Created by EbwjwgbHP64g5DPwCqcF1oKFEikinCPQ2vNWwmnsaYkz yesterday at 01:50

J4YFZJCF4Q57B3EERJRZJM37QU2LADHAPOYSC7ZFRRUY65PI6LRAC

Dependencies

[2] WXFIZKTKYWQAT7EQ6KZKUTVDICW6IHX3J45T2JPZ43YLLLYBAZXAC

In channels

main

Change contents

Insertion in src/Ip.hs at line 6 [2.7074]
[2.7180]
[2.7180]
```
import Control.Exception (IOException, try)
```

Replacement in src/Ip.hs at line 28 [2.7074]

B:BD[2.7794] → [2.7794:7879]

    Nothing -> do
      hPutStrLn stderr $ "Could not resolve nameserver " ++ nsHost

[2.7794]

[2.7879]

    Left err -> do
      hPutStrLn stderr $ show err

Replacement in src/Ip.hs at line 31 [2.7074]
B:BD[2.7893] → [2.7893:7914]
```
    Just ipStr -> do
```
[2.7893]
[2.7914]
```
    Right (Just ipStr) -> do
```

Insertion in src/Ip.hs at line 45 [2.7074]

[2.8487]

    Right Nothing -> do
      hPutStrLn stderr $ "No server found for " ++ domain
      pure []

Replacement in src/Ip.hs at line 49 [2.7074]

B:BD[2.8488] → [2.8488:8537]

resolveNameServer :: String -> IO (Maybe String)

[2.8488]

[2.8537]

resolveNameServer :: String -> IO (Either IOException (Maybe String))

Replacement in src/Ip.hs at line 51 [2.7074]

B:BD[2.8560] → [2.8560:8647]

  | all (`elem` (".0123456789" :: String)) host = pure (Just host)  -- already numeric

[2.8560]

[2.8647]

  | all (`elem` (".0123456789" :: String)) host =
      pure (Right (Just host))

Replacement in src/Ip.hs at line 54 [2.7074]

B:BD[2.8666] → [2.8666:8808]

      infos <- getAddrInfo (Just defaultHints) (Just host) (Just "53")
      pure $ fmap (stripPort . show . addrAddress) (listToMaybe infos)

[2.8666]

[2.8808]

      result <- try $
        getAddrInfo (Just defaultHints) (Just host) (Just "53")
      case result of
        Left err ->
          pure (Left (err))
        Right infos ->
          case listToMaybe infos of
            Nothing ->
              pure (Right (Nothing))
            Just info ->
              let ip = stripPort . show . addrAddress $ info
              in pure (Right (Just ip))

Deletion in app/Controller.hs at line 27 [2.12987]

B:BD[2.13713] → [2.13713:13830]

  safeMain `catch` \(e :: SomeException) -> hPutStrLn stderr $ "[ERROR] " ++ show e
safeMain :: IO ()
safeMain = do

Deletion in app/Controller.hs at line 41 [2.12987]
B:BD[2.14307] → [2.14307:14325]
```
      exitFailure
```
Deletion in app/Controller.hs at line 51 [2.12987]
B:BD[2.14679] → [2.14679:14724]
```
          putStrLn $ "the IP is " ++ show ip
```