Do not expose the benchmark commands

We're missing some dependencies, and these are development-only commands
anyway.
parent dd4d4eae
......@@ -13,8 +13,6 @@ that we haven't needed the dynamic lookup yet.
src/puppetlabs/puppetdb/core.clj | 113 +++++++---------------
4 files changed, 36 insertions(+), 82 deletions(-)
diff --git a/src/puppetlabs/puppetdb/cli/benchmark.clj b/src/puppetlabs/puppetdb/cli/benchmark.clj
index af96ebce..eb15ba17 100644
--- a/src/puppetlabs/puppetdb/cli/benchmark.clj
+++ b/src/puppetlabs/puppetdb/cli/benchmark.clj
@@ -65,8 +65,6 @@
......@@ -26,8 +24,6 @@ index af96ebce..eb15ba17 100644
(defn try-load-file
"Attempt to read and parse the JSON in `file`. If this failed, an error is
logged, and nil is returned."
diff --git a/src/puppetlabs/puppetdb/cli/services.clj b/src/puppetlabs/puppetdb/cli/services.clj
index 433e65ff..ec38d282 100644
--- a/src/puppetlabs/puppetdb/cli/services.clj
+++ b/src/puppetlabs/puppetdb/cli/services.clj
@@ -82,7 +82,6 @@
......@@ -38,8 +34,6 @@ index 433e65ff..ec38d282 100644
(def database-metrics-registry (get-in metrics/metrics-registries [:database :registry]))
;; ## Wiring
diff --git a/src/puppetlabs/puppetdb/cli/version.clj b/src/puppetlabs/puppetdb/cli/version.clj
index 7ef5e031..81056bd4 100644
--- a/src/puppetlabs/puppetdb/cli/version.clj
+++ b/src/puppetlabs/puppetdb/cli/version.clj
@@ -12,8 +12,6 @@
......@@ -51,11 +45,9 @@ index 7ef5e031..81056bd4 100644
;; TODO: Would like to add database info and some other things here, but that
;; will require us to have access to the configuration info. At present, the
;; configuration parsing code is scattered throughout services.clj and not
diff --git a/src/puppetlabs/puppetdb/core.clj b/src/puppetlabs/puppetdb/core.clj
index d4e9b497..1b81f064 100644
--- a/src/puppetlabs/puppetdb/core.clj
+++ b/src/puppetlabs/puppetdb/core.clj
@@ -1,90 +1,49 @@
@@ -1,90 +1,43 @@
(ns puppetlabs.puppetdb.core
- "CLI invokation
-
......@@ -110,8 +102,6 @@ index d4e9b497..1b81f064 100644
+ "Handles command line arguments."
+ (:require
+ [clojure.string :as str]
+ [puppetlabs.puppetdb.cli.benchmark :as benchmark]
+ [puppetlabs.puppetdb.cli.fact-storage-benchmark :as fstore-bench]
+ [puppetlabs.puppetdb.cli.services :as svcs]
+ [puppetlabs.puppetdb.cli.version :as cver]
+ [puppetlabs.puppetdb.utils :as utils]
......@@ -121,8 +111,6 @@ index d4e9b497..1b81f064 100644
+ ["Available subcommands:"
+ " version Display version information"
+ " services Run PuppetDB"
+ " benchmark Run development-only benchmarking tool"
+ " fact-storage-benchmark"
+ "For help on a given subcommand, invoke it with -h"])
(defn usage
......@@ -151,8 +139,6 @@ index d4e9b497..1b81f064 100644
+ (let [run (case subcommand
+ "version" #(apply cver/-main args)
+ "services" #(apply svcs/-main args)
+ "benchmark" #(apply benchmark/-main args)
+ "fact-storage-benchmark" #(apply fstore-bench/-main args)
+ (do
+ ;; FIXME: this should be *err*
+ (usage *out*)
......@@ -182,6 +168,3 @@ index d4e9b497..1b81f064 100644
(defn -main
[& args]
--
2.20.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment