fix constant defining

abstractive · Dec 13, 2019 · e546da1 · e546da1
1 parent 7ca21aa
commit e546da1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-# v201912131050-4Kg1 0.0.1.23
+# v201912131050-4Kg1 0.0.1.24
 * Allow override of configuration file name
 * Pass content-type as `request.format` and pass JSON body as `request.data`
 

diff --git a/shard.yml b/shard.yml
@@ -1,5 +1,5 @@
 name: artillery
-version: 0.0.1.23
+version: 0.0.1.24
 
 description: Serverfree object-oriented microservice architecture.
 

diff --git a/src/artillery/initialize.cr b/src/artillery/initialize.cr
@@ -5,11 +5,8 @@ module Artillery
   #de 2. artillery.yml
   #de 3. Defaults
 
-  ENVIRONMENT = ENV["ARTILLERY_ENVIRONMENT"] ||= @@environment
+  ENVIRONMENT = ENV["ARTILLERY_ENVIRONMENT"] ||= "development"
   CALLSITE = (ENV["ARTILLERY_CALLSITE"] ||= `pwd`).chomp
-  unless self.has_constant? :CONFIGURATION
-    CONFIGURATION = (ENV["ARTILLERY_CONFIGURATION"] ||= "artillery.yml")
-  end
 
   #de Defaults:
   @@yaml = uninitialized YAML::Any
@@ -18,6 +15,8 @@ module Artillery
   @@mountpoint_port_zeromq = uninitialized String
   @@mountpoint_port_http = uninitialized String
 
+  CONFIGURATION = ENV["ARTILLERY_CONFIGURATION"] ||= "artillery.yml"
+
   @@public_directory = "./public"
   @@mountpoint_interface = "0.0.0.0"
   @@mountpoint_port_zeromq = "4000"