From 255b93e7713aca72575d5ee314c8d14f46f8ddb9 Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Thu, 27 Apr 2023 09:37:13 +0700 Subject: [PATCH] Update resolver to lts-20.18 --- src/Main.hs | 11 +++++------ stack.yaml | 9 ++++----- stack.yaml.lock | 39 ++++++++++++++++----------------------- 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index 2216b0b..b50909c 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -6,9 +6,8 @@ import ATrade (libatrade_gitrev, import ATrade.Broker.Protocol (NotificationSqnum (NotificationSqnum)) import ATrade.Broker.Server (startBrokerServer, stopBrokerServer) -import ATrade.Logging (Message (..), Severity (Debug, Error, Info, Warning), - logWith) -import ATrade.Logging (fmtMessage) +import ATrade.Logging (Message (..), Severity (Debug, Error, Info, Trace, Warning), + fmtMessage, logWith) import ATrade.QuoteSource.Server (startQuoteSourceServer, stopQuoteSourceServer) import ATrade.Types (defaultServerSecurityParams) @@ -41,8 +40,8 @@ parseLoglevel :: Int -> Severity parseLoglevel 0 = Error parseLoglevel 1 = Warning parseLoglevel 2 = Info -parseLoglevel _ = Debug - +parseLoglevel 3 = Debug +parseLoglevel _ = Trace main :: IO () main = do @@ -76,7 +75,7 @@ main = do (NotificationSqnum 1) [] defaultServerSecurityParams - logger) stopBrokerServer $ \_ -> do + logger) (\x -> log Info "main" "Stopping" >> stopBrokerServer x) $ \_ -> do withHistoryProviderServer ctx (historyProviderEndpoint cfg) txml logger id $ \_ -> do forever $ threadDelay 1000000 log Info "main" "Shutting down" diff --git a/stack.yaml b/stack.yaml index 4af19e9..d913d2e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-18.18 +resolver: lts-20.18 # User packages to be built. # Various formats can be used as shown in the example below. @@ -45,10 +45,9 @@ packages: # extra-deps: - datetime-0.3.1 -- co-log-0.4.0.1@sha256:3d4c17f37693c80d1aa2c41669bc3438fac3e89dc5f479e57d79bc3ddc4dfcc5,5087 -- ansi-terminal-0.10.3@sha256:e2fbcef5f980dc234c7ad8e2fa433b0e8109132c9e643bc40ea5608cd5697797,3226 -- proto3-suite-0.5.1@sha256:045994919b105b89c44e3ae94f50258b86a6ebfd14425845e13e0921d2e8610e,7015 -- clock-0.8@sha256:b4ae207e2d3761450060a0d0feb873269233898039c76fceef9cc1a544067767,4113 +- co-log-0.5.0.0 +- chronos-1.1.5@sha256:ca35be5fdbbb384414226b4467c6d1c8b44defe59a9c8a3af32c1c5fb250c781,3830 +- typerep-map-0.5.0.0@sha256:34f1ba9b268a6d52e26ae460011a5571e8099b50a3f4a7c8db25dd8efe3be8ee,4667 # Override default flag values for local packages and extra-deps diff --git a/stack.yaml.lock b/stack.yaml.lock index 3fb5f55..57a186b 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -12,36 +12,29 @@ packages: original: hackage: datetime-0.3.1 - completed: - hackage: co-log-0.4.0.1@sha256:3d4c17f37693c80d1aa2c41669bc3438fac3e89dc5f479e57d79bc3ddc4dfcc5,5087 + hackage: co-log-0.5.0.0@sha256:a7e84650eaef7eba2d59ee7664309e79317a7ca67011abedf971f0e6bd6475bb,5448 pantry-tree: - size: 1126 - sha256: e73165ff8f744709428e2e87984c9d60ca1cec43d8455c413181c7c466e7497c + size: 1043 + sha256: 33b838c07c8b7e70b2e82bddc889bb1e6386d7e12a9d1593c0b4b263b1fcb925 original: - hackage: co-log-0.4.0.1@sha256:3d4c17f37693c80d1aa2c41669bc3438fac3e89dc5f479e57d79bc3ddc4dfcc5,5087 + hackage: co-log-0.5.0.0 - completed: - hackage: ansi-terminal-0.10.3@sha256:e2fbcef5f980dc234c7ad8e2fa433b0e8109132c9e643bc40ea5608cd5697797,3226 + hackage: chronos-1.1.5@sha256:ca35be5fdbbb384414226b4467c6d1c8b44defe59a9c8a3af32c1c5fb250c781,3830 pantry-tree: - size: 1461 - sha256: 02f05d52be3ffcf36c78876629cbab80b63420672685371aea4fd10e1c4aabb6 + size: 581 + sha256: 329bf39a05362a9c1f507a4a529725c757208843b562c55e0b7c88538dc3160f original: - hackage: ansi-terminal-0.10.3@sha256:e2fbcef5f980dc234c7ad8e2fa433b0e8109132c9e643bc40ea5608cd5697797,3226 + hackage: chronos-1.1.5@sha256:ca35be5fdbbb384414226b4467c6d1c8b44defe59a9c8a3af32c1c5fb250c781,3830 - completed: - hackage: proto3-suite-0.5.1@sha256:045994919b105b89c44e3ae94f50258b86a6ebfd14425845e13e0921d2e8610e,7015 + hackage: typerep-map-0.5.0.0@sha256:34f1ba9b268a6d52e26ae460011a5571e8099b50a3f4a7c8db25dd8efe3be8ee,4667 pantry-tree: - size: 3402 - sha256: 7387c16e46bdcbcfdfc87b42a1dfd17bf6f7168a50b409469d993f7f73a6f133 + size: 1487 + sha256: ca5565de307d260dc67f6dae0d4d33eee42a3238183461569b5142ceb909c91d original: - hackage: proto3-suite-0.5.1@sha256:045994919b105b89c44e3ae94f50258b86a6ebfd14425845e13e0921d2e8610e,7015 -- completed: - hackage: clock-0.8@sha256:b4ae207e2d3761450060a0d0feb873269233898039c76fceef9cc1a544067767,4113 - pantry-tree: - size: 446 - sha256: d9ac8ce6a19812fe74cb1e74228e6e624eda19021ff4d12e24611f88abacd38a - original: - hackage: clock-0.8@sha256:b4ae207e2d3761450060a0d0feb873269233898039c76fceef9cc1a544067767,4113 + hackage: typerep-map-0.5.0.0@sha256:34f1ba9b268a6d52e26ae460011a5571e8099b50a3f4a7c8db25dd8efe3be8ee,4667 snapshots: - completed: - size: 586296 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/18.yaml - sha256: 63539429076b7ebbab6daa7656cfb079393bf644971156dc349d7c0453694ac2 - original: lts-18.18 + size: 649606 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/18.yaml + sha256: 9fa4bece7acfac1fc7930c5d6e24606004b09e80aa0e52e9f68b148201008db9 + original: lts-20.18