Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit d2a6f24

Browse files
authored
Merge pull request #1039 from bubba/remove-ekg
Remove EKG
2 parents 81c26ad + 2b97232 commit d2a6f24

File tree

8 files changed

+1
-28
lines changed

8 files changed

+1
-28
lines changed

app/MainHie.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import qualified Paths_haskell_ide_engine as Meta
1818
import System.Directory
1919
import System.Environment
2020
import qualified System.Log.Logger as L
21-
import qualified System.Remote.Monitoring.Wai as EKG
2221

2322
-- ---------------------------------------------------------------------
2423
-- plugins
@@ -111,10 +110,6 @@ run opts = do
111110
warningm $ "Mismatching GHC versions: Project is " ++ projGhcVersion
112111
++ ", HIE is " ++ hieGhcVersion
113112

114-
when (optEkg opts) $ do
115-
logm $ "Launching EKG server on port " ++ show (optEkgPort opts)
116-
void $ EKG.forkServer "localhost" (optEkgPort opts)
117-
118113
origDir <- getCurrentDirectory
119114

120115
maybe (pure ()) setCurrentDirectory $ projectRoot opts

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ packages:
66
./submodules/brittany
77
./submodules/cabal-helper/
88
./submodules/ghc-mod/
9-
./submodules/ghc-mod/core/
9+
./submodules/ghc-mod/core/

haskell-ide-engine.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ executable hie
103103
other-modules: Paths_haskell_ide_engine
104104
build-depends: base
105105
, directory
106-
, ekg-wai
107106
, ghc-mod-core
108107
, haskell-ide-engine
109108
, haskell-lsp

src/Haskell/Ide/Engine/Options.hs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ data GlobalOpts = GlobalOpts
1313
, optJson :: Bool
1414
, projectRoot :: Maybe String
1515
, optGhcModVomit :: Bool
16-
, optEkg :: Bool
17-
, optEkgPort :: Int
1816
, optCaptureFile :: Maybe FilePath
1917
, optExamplePlugin :: Bool
2018
} deriving (Show)
@@ -46,16 +44,6 @@ globalOptsParser = GlobalOpts
4644
<*> switch
4745
( long "vomit"
4846
<> help "enable vomit logging for ghc-mod")
49-
<*> switch
50-
( long "ekg"
51-
<> help "enable ekg collection and display on http://localhost:8000")
52-
<*> option auto
53-
( long "port"
54-
<> short 'p'
55-
<> metavar "PORT"
56-
<> help "TCP port to use for EKG server. Only used if --ekg is set. Default 8000"
57-
<> value 8000
58-
)
5947
<*> optional (strOption
6048
( long "capture"
6149
<> short 'c'

stack-8.6.1.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ extra-deps:
1717
- constrained-dynamic-0.1.0.0
1818
- czipwith-1.0.1.1
1919
- data-tree-print-0.1.0.2
20-
- ekg-core-0.1.1.6
21-
- ekg-json-0.1.0.6
22-
- ekg-wai-0.1.0.3
2320
- haddock-api-2.21.0
2421
- haskell-lsp-0.8.0.1
2522
- haskell-lsp-types-0.8.0.1

stack-8.6.2.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ extra-deps:
1313
- butcher-1.3.2.1
1414
- cabal-plan-0.4.0.0
1515
- constrained-dynamic-0.1.0.0
16-
- ekg-json-0.1.0.6
17-
- ekg-wai-0.1.0.3
1816
- haddock-api-2.21.0
1917
- hsimport-0.8.6
2018
- lsp-test-0.5.0.2

stack-8.6.3.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ extra-deps:
1313
- butcher-1.3.2.1
1414
- cabal-plan-0.4.0.0
1515
- constrained-dynamic-0.1.0.0
16-
- ekg-json-0.1.0.6
17-
- ekg-wai-0.1.0.3
1816
- haddock-api-2.21.0
1917
- hsimport-0.8.6
2018
- monad-memo-0.4.1

stack.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ extra-deps:
1313
- butcher-1.3.2.1
1414
- cabal-plan-0.4.0.0
1515
- constrained-dynamic-0.1.0.0
16-
- ekg-json-0.1.0.6
17-
- ekg-wai-0.1.0.3
1816
- haddock-api-2.21.0
1917
- hsimport-0.8.6
2018
- monad-memo-0.4.1

0 commit comments

Comments
 (0)