Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-04-04 13:49:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup/warnings (#53)

Browse Source 
* implements error log reporting

* removes redundant imports
This commit is contained in:
Keagan McClelland
2021-09-16 18:04:22 -06:00
committed by GitHub
parent f82e3caf28
commit 3ee6550543
3 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Application.hs
View File

@@ -40,7 +40,7 @@ import Network.Wai.Middleware.AcceptOverride
import Network.Wai.Middleware.Autohead import Network.Wai.Middleware.Autohead
import Network.Wai.Middleware.Cors (CorsResourcePolicy (..), cors, simpleCorsResourcePolicy) import Network.Wai.Middleware.Cors (CorsResourcePolicy (..), cors, simpleCorsResourcePolicy)
import Network.Wai.Middleware.MethodOverride import Network.Wai.Middleware.MethodOverride
import Network.Wai.Middleware.RequestLogger (Destination (Logger), IPAddrSource (..), OutputFormat (..), import Network.Wai.Middleware.RequestLogger (Destination (Logger), OutputFormat (..),
destination, mkRequestLogger, outputFormat) destination, mkRequestLogger, outputFormat)
import System.IO (hSetBuffering, BufferMode (..)) import System.IO (hSetBuffering, BufferMode (..))
import System.Log.FastLogger (defaultBufSize, newStdoutLoggerSet, toLogStr) import System.Log.FastLogger (defaultBufSize, newStdoutLoggerSet, toLogStr)

3
src/Handler/ErrorLogs.hs
View File

@@ -5,7 +5,6 @@ module Handler.ErrorLogs where
import Control.Monad ( MonadFail(fail) ) import Control.Monad ( MonadFail(fail) )
import Data.Aeson ( (.:) import Data.Aeson ( (.:)
, FromJSON(parseJSON) , FromJSON(parseJSON)
, eitherDecode
, withObject , withObject
, withText , withText
) )
@@ -25,8 +24,6 @@ data ErrorLog = ErrorLog
} }
deriving (Eq, Show) deriving (Eq, Show)
-- >>> eitherDecode "{ \"log-epoch\": \"1234\", \"log-message\": \"This is the famous budweiser beer\" }" :: Either String ErrorLog
-- Variable not in scope: eitherDecode :: t0 -> Either String ErrorLog
instance FromJSON ErrorLog where instance FromJSON ErrorLog where
parseJSON = withObject "Error Log" $ \o -> do parseJSON = withObject "Error Log" $ \o -> do
errorLogEpoch <- o .: "log-epoch" >>= withText errorLogEpoch <- o .: "log-epoch" >>= withText

26
src/Handler/Icons.hs
View File

@@ -7,27 +7,21 @@
module Handler.Icons where module Handler.Icons where
import Startlude hiding (Handler) import Startlude hiding ( Handler )
import Data.Conduit
import qualified Data.Conduit.Combinators as CB
import System.Directory
import Yesod.Core import Yesod.Core
import Foundation
import Lib.Registry
import Settings
import System.FilePath ((</>))
import Util.Shared
import Lib.External.AppMgr
import Lib.Error
import Data.Conduit.Process
import Conduit
import qualified Data.ByteString.Lazy as BS
import Network.HTTP.Types
import Lib.Types.AppIndex
import Data.Aeson import Data.Aeson
import qualified Data.ByteString.Lazy as BS
import Foundation
import Lib.Error
import Lib.External.AppMgr
import Lib.Registry
import Lib.Types.AppIndex
import Network.HTTP.Types
import Settings
import System.FilePath.Posix import System.FilePath.Posix
import Util.Shared
data IconType = PNG | JPG | JPEG | SVG data IconType = PNG | JPG | JPEG | SVG
deriving (Eq, Show, Generic, Read) deriving (Eq, Show, Generic, Read)