smartcloud 0.0.152 → 0.0.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3146224d7a28c5f2be95c7c1df25a6aee6f389063869f6c779203835522b1371
-  data.tar.gz: 68e4fd2197a102fbe154f941342d5073a0fdfc071bae2cc60e6580b4a78610f0
+  metadata.gz: c37e30863d1ea6b5a7a3c585cb4f41a6aadcf1f0dced48add9830a142213bc35
+  data.tar.gz: 1280b3a725d4331feef89ed347b241da53dcb44b0a83e87d63a7130823638117
 SHA512:
-  metadata.gz: aaa85bfdcf08755d72b2bc56185c8fb37b1874a174d96f697c52fc75aff92adb13073a6cbccf2d80711065e9a4e2661bc1d11adb7f5988569e9a64542eee5498
-  data.tar.gz: 91212d5681a150e13e144f73bd96c6c4ae4bf6844140a3c83d17a74c891495bc0b7a3821bffca40c7c9cb0de99b508ca37f0dedc7abb79b459189e27bc428cab
+  metadata.gz: 5135a9e4d789b0dcebf218ba6a24cf4344c766440a747695a16e82bbfa41dfafe5076c53b45a6dee4275ea2ebd50ac730e68e8025b20c020bce742320ca0cc98
+  data.tar.gz: 6077c2671d93ae32d888474f9afd8e46d3ab9a13c9158cade314d49b4bcb9072faeafddaf54fd72bd22e966922ffd9937ead3f67ed88eeba637402d86f1b18a0

data/lib/smartcloud/grids/runner.rb

@@ -222,25 +222,15 @@ module Smartcloud
 				logger.formatter = proc do |severity, datetime, progname, message|
 				  "\t\t\t-----> #{severity}: #{message}\n"
 				end
+				logger.level = ::Logger::DEBUG
 
 				container_path = "#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/containers/#{appname}"
 
-				## Verify the user and ensure the user is correct and has access to this repository
-				logger.info "Verifying User ..."
-				unless File.exist? "#{container_path}/env"
-					logger.fatal "Environment could not be loaded ... Failed."
-					return
-				end
-
 				# Load ENV vars
-				File.open("#{container_path}/env").each_line do |line|
-					line.chomp!
-					next if line.empty? || line.start_with?('#')
-				    key, value = line.split "="
-				    ENV[key] = value
-				end
+				return unless self.load_container_env_vars(container_path)
 
-				# Match Username
+				# Verify the user and ensure the user is correct and has access to this repository
+				logger.info "Verifying User ..."
 				unless ENV['USERNAME'] == username
 					logger.error "Unauthorized."
 					return
@@ -279,32 +269,25 @@ module Smartcloud
 					container_path = "#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/containers/#{appname}"
 
 					Dir.chdir("#{container_path}/releases") do
+						# Getting App Version
 						if app_version == 0
 							app_versions = Dir.glob('*').select { |f| File.directory? f }.sort
 							app_version = app_versions.last
 						end
-
 						container_path_with_version = "#{container_path}/releases/#{app_version}"
 
 						# Setup Buildpacker
 						buildpacker_path = "#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb"
 						FileUtils.cp(buildpacker_path, container_path_with_version)
 
+						# Launching Application
 						logger.info "Launching Application ..."
-
 						if File.exist? "#{container_path_with_version}/bin/rails"
-							# Stopping & Removing container
-							self.stop_app(appname)
-
 							# Starting Rails App
 							self.start_app_rails(appname, container_path, container_path_with_version)
 						end
 					end
 				end
-
-				# These two lines are important to stop and remove container and then cancel pre-receive push if finally the app could not be started.
-				# If the app was finally started, then these two lines should never be executed.
-				self.stop_app(appname)
 			end
 
 			def self.stop_app(appname)
@@ -314,7 +297,7 @@ module Smartcloud
 						if system("docker stop '#{appname}'", out: File::NULL)
 							logger.debug "Removing container #{appname} ..."
 							if system("docker rm '#{appname}'", out: File::NULL)
-								logger.info "Stopped & Removed #{appname} ..."
+								logger.debug "Stopped & Removed #{appname} ..."
 							end
 						end
 					end
@@ -322,7 +305,10 @@ module Smartcloud
 			end
 
 			def self.start_app_rails(appname, container_path, container_path_with_version)
-				logger.info "Ruby on Rails application detected"
+				# Stopping & Removing not required app containers
+				self.stop_app(appname)
+
+				logger.info "Ruby on Rails application detected."
 
 				# Setup rails env
 				env_path = "#{container_path}/env"
@@ -376,17 +362,37 @@ module Smartcloud
 			def self.clean_up(container_path)
 				logger.info "Cleaning up ..."
 
+				# Stopping & Removing not required app containers
+				self.stop_app(appname)
+
 				# Clean up very old versions
 				Dir.chdir("#{container_path}/releases") do
 					app_versions = Dir.glob('*').select { |f| File.directory? f }.sort
 					destroy_count = app_versions.count - ENV['KEEP_RELEASES'].to_i
 					if destroy_count > 0
+						logger.debug "Deleting older application releases ..."
 						destroy_count.times do
 							FileUtils.rm_r(File.join(Dir.pwd, app_versions.shift))
 						end
 					end
 				end
 			end
+
+			def self.load_container_env_vars(container_path)
+				unless File.exist? "#{container_path}/env"
+					logger.fatal "Environment could not be loaded ... Failed."
+					false
+				end
+
+				File.open("#{container_path}/env").each_line do |line|
+					line.chomp!
+					next if line.empty? || line.start_with?('#')
+				    key, value = line.split "="
+				    ENV[key] = value
+				end
+
+				true
+			end
 		end
 	end
 end

data/lib/smartcloud/logger.rb

@@ -24,6 +24,7 @@ module Smartcloud
 
 	    def configure_logger_for(classname)
 	      logger = ::Logger.new($stdout)
+		  logger.level = ::Logger::INFO
 	      logger.progname = classname
 	      logger
 	    end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.152
+  version: 0.0.153
 platform: ruby
 authors:
 - Timeboard