diff options
Diffstat (limited to 'lib/Server/Ingest.hs')
| -rw-r--r-- | lib/Server/Ingest.hs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/Server/Ingest.hs b/lib/Server/Ingest.hs index 363088c..8e122a7 100644 --- a/lib/Server/Ingest.hs +++ b/lib/Server/Ingest.hs @@ -13,9 +13,9 @@ import Control.Monad.Catch (handle) import Control.Monad.Extra (ifM, mapMaybeM, whenJust, whenJustM) import Control.Monad.IO.Class (MonadIO (liftIO)) -import Control.Monad.Logger (LoggingT, logInfoN, - logErrorN, - logWarnN, logDebugN) +import Control.Monad.Logger (LoggingT, logDebugN, + logErrorN, logInfoN, + logWarnN) import Control.Monad.Reader (ReaderT) import qualified Data.Aeson as A import qualified Data.ByteString.Char8 as C8 @@ -37,7 +37,8 @@ import Fmt ((+|), (|+)) import qualified GTFS import qualified Network.WebSockets as WS import Persist -import Servant (err400, err401, throwError) +import Servant (err400, err401, + throwError) import Servant.Server (Handler) import Server.Util (ServiceM, getTzseries, utcToSeconds) @@ -49,20 +50,21 @@ import Data.ByteString (ByteString) import Data.ByteString.Lazy (toStrict) import Data.Foldable (find, minimumBy) import Data.Function (on, (&)) +import Data.Maybe (fromJust) import qualified Data.Text as T import Data.Time.LocalTime.TimeZone.Series (TimeZoneSeries) import qualified Data.UUID as UUID +import Database.Esqueleto.Experimental (from, selectOne, table, + val, where_, (^.)) +import qualified Database.Esqueleto.Experimental as E import Extrapolation (Extrapolator (..), LinearExtrapolator (..), euclid) import GHC.Generics (Generic) import GTFS (seconds2Double) +import OwnTracks hiding (Ping) import Prometheus (decGauge, incGauge) import Server.Base (ServerState) -import OwnTracks hiding (Ping) -import Database.Esqueleto.Experimental (selectOne, where_, (^.), table, from, val) -import qualified Database.Esqueleto.Experimental as E -import Data.Maybe (fromJust) handleTrackerRegister :: Pool SqlBackend @@ -128,7 +130,7 @@ handleOwntracksMessage handleOwntracksMessage dbpool subscribers cfg maybeUser device msg = do user <- case maybeUser of Just user -> pure user - Nothing -> throwError err401 + Nothing -> throwError err401 -- TODO: maybe get the basic json here, and put it into a log-msg table? |