Skip to content
Permalink
Browse files

Try #512:

  • Loading branch information...
iohk-bors committed May 15, 2019
2 parents ed7879a + 9faca26 commit db651aed1ed789362da75a78be34aae52afc4d92

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -9,13 +9,13 @@ packages: byron-proxy.cabal
source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cecf1f4ef0858761342159ca482bffb3038ec8c8
subdir: iohk-monitoring

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cecf1f4ef0858761342159ca482bffb3038ec8c8
subdir: contra-tracer

--
@@ -0,0 +1,40 @@
# global filter; messages must have at least this severity to pass:
minSeverity: Debug

# these backends are initialized:
setupBackends:
- EKGViewBK
- KatipBK

# if not indicated otherwise, then messages are passed to these backends:
defaultBackends:
- EKGViewBK
- KatipBK

# if wanted, the GUI is listening on this port:
# hasGUI: 18321

# if wanted, the EKG interface is listening on this port:
hasEKG: 12789

# if wanted, the Prometheus interface is using this port:
hasPrometheus: 12799

# here we set up outputs of logging in 'katip':
setupScribes:
- scKind: StdoutSK
scFormat: ScText
scName: stdout

# if not indicated otherwise, then log output is directed to this:
defaultScribes:
- - StdoutSK
- stdout

# more options which can be passed as key-value pairs:
options:
mapSubtrace:
'#messagecounters.switchboard':
subtrace: NoTrace
'#messagecounters.ekgview':
subtrace: NoTrace
@@ -12,10 +12,11 @@ import Control.Monad.Class.MonadST (MonadST)
import Control.Monad.IO.Class (liftIO)
import Control.Monad.Trans.Class (lift)
import Control.Monad.Trans.Resource (ResourceT, runResourceT)
import Control.Tracer (Tracer (..), contramap, nullTracer, traceWith)
import Control.Tracer (Tracer (..), nullTracer, traceWith)
import qualified Data.ByteString.Lazy as Lazy (ByteString, fromStrict)
import qualified Data.ByteString.Lazy.Char8 as Lazy (pack)
import Data.Either (either)
import Data.Functor.Contravariant (contramap)
import qualified Data.Map as Map

import Network.TypedProtocol.Channel (hoistChannel)
@@ -10,9 +10,9 @@ import Control.Concurrent (myThreadId)
import Control.Concurrent.Async (concurrently)
import Control.Concurrent.STM (STM, atomically, retry)
import Control.Monad (forM_)
import Control.Tracer (Tracer (..), contramap, traceWith)
import Control.Tracer (Tracer (..), traceWith)
import qualified Data.ByteString.Lazy as Lazy (fromStrict)
import Data.Functor.Contravariant (Op (..))
import Data.Functor.Contravariant (Op (..), contramap)
import Data.List (intercalate)
import Data.List.NonEmpty (NonEmpty)
import qualified Data.List.NonEmpty as NE
@@ -219,12 +219,14 @@ defaultLoggerConfig = Monitoring.Representation
, Monitoring.setupBackends = [Monitoring.KatipBK]
, Monitoring.defaultBackends = [Monitoring.KatipBK]
, Monitoring.hasEKG = Nothing
, Monitoring.hasPrometheus = Nothing
, Monitoring.hasGUI = Nothing
, Monitoring.options = mempty
}
where
stdoutScribe = Monitoring.ScribeDefinition
{ Monitoring.scKind = Monitoring.StdoutSK
, Monitoring.scFormat = Monitoring.ScText
, Monitoring.scName = "stdout"
, Monitoring.scPrivacy = Monitoring.ScPublic
, Monitoring.scRotation = Nothing
@@ -21,13 +21,13 @@ source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
subdir: iohk-monitoring
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cecf1f4ef0858761342159ca482bffb3038ec8c8

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
subdir: contra-tracer
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cecf1f4ef0858761342159ca482bffb3038ec8c8

source-repository-package
type: git

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -37,6 +37,7 @@ let
packages.io-sim-classes.configureFlags = [ "--ghc-option=-Werror" ];
packages.ouroboros-network.configureFlags = [ "--ghc-option=-Werror" ];
packages.ouroboros-consensus.configureFlags = [ "--ghc-option=-Werror" ];
packages.prometheus.components.library.doExactConfig = true;
}
];
};
@@ -33,6 +33,7 @@ import Control.Monad (void)
import Crypto.Random (ChaChaDRG)
import Data.Map.Strict (Map)
import Data.Void (Void)
import Data.Functor.Contravariant (contramap)

import Control.Monad.Class.MonadAsync
import Control.Monad.Class.MonadFork (MonadFork)
@@ -21,6 +21,7 @@ commonLib.pkgs.lib.mapAttrsRecursiveCond
"ouroboros-consensus"
"io-sim"
"io-sim-classes"
"byron-proxy"
];

# The set of jobs we consider crutial for each CI run.
@@ -67,6 +68,6 @@ commonLib.pkgs.lib.mapAttrsRecursiveCond
jobs.nix-tools.tests.io-sim.tests.x86_64-linux

jobs.nix-tools.exes.ouroboros-consensus.x86_64-linux
# jobs.nix-tools.exes.byron-proxy.x86_64-linux
jobs.nix-tools.exes.byron-proxy.x86_64-linux
];
} args)
@@ -12,7 +12,7 @@ packages:

extra-deps:
- git: https://github.com/input-output-hk/iohk-monitoring-framework
commit: b656651fd3c357860d8136598b223b048c195eae
commit: cecf1f4ef0858761342159ca482bffb3038ec8c8
subdirs:
- iohk-monitoring
- contra-tracer
@@ -35,6 +35,9 @@ extra-deps:
- libyaml-0.1.0.0
- time-units-1.0.0
- ekg-json-0.1.0.6
- ekg-prometheus-adapter-0.1.0.4
- prometheus-2.1.1
- containers-0.5.11.0
- graphviz-2999.20.0.3@sha256:cde383c356bc41136ed53cd27e0800f46dbd2185600dd0de18d66d5c49739d94
- quickcheck-state-machine-0.6.0@sha256:3e4f8df0f6b5d415e3c8840dc75034a63e37f56f5f8cfa1035ded16345235ac4

@@ -100,6 +103,7 @@ extra-deps:
- writer-cps-transformers-0.5.6.0
- o-clock-1.0.0.1
- ekg-wai-0.1.0.3
- lzma-clib-5.2.2
# End of byron-proxy-induced dependencies.


0 comments on commit db651ae

Please sign in to comment.
You can’t perform that action at this time.