smartcloud 0.0.153 → 0.0.158

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c37e30863d1ea6b5a7a3c585cb4f41a6aadcf1f0dced48add9830a142213bc35
-  data.tar.gz: 1280b3a725d4331feef89ed347b241da53dcb44b0a83e87d63a7130823638117
+  metadata.gz: fff4e804fc58c90059552cb40f468f7965a59e7a2846eabf717055da100ae6fb
+  data.tar.gz: c16f0c09b64dabbf9f9fd086b66eb029eec69c5cb4fb1640e0cbd6d0ccedb017
 SHA512:
-  metadata.gz: 5135a9e4d789b0dcebf218ba6a24cf4344c766440a747695a16e82bbfa41dfafe5076c53b45a6dee4275ea2ebd50ac730e68e8025b20c020bce742320ca0cc98
-  data.tar.gz: 6077c2671d93ae32d888474f9afd8e46d3ab9a13c9158cade314d49b4bcb9072faeafddaf54fd72bd22e966922ffd9937ead3f67ed88eeba637402d86f1b18a0
+  metadata.gz: 44f8f14e9cc581fb038c8d164cb07efdf0c893796df35f71133d62d54babde5023285fb66d143e45ccacd2864cbfe316f597570eefcd1a98405216701cf117d3
+  data.tar.gz: 8a491b59078f8bf1a273dbde6b54d012cb8f95b9fc303ce617696098909951fdfcec02e797fe78cca041c84cb7acb9bbd3891f8d690ee2fa0e9e8c35e0f6008e

data/lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb

@@ -1,30 +1,44 @@
+require "logger"
+
 class Buildpacker
 	def initialize		
 	end
 	
 	def pack
 		pack_rails if File.exist? "bin/rails"
-		puts "-----> Could not continue ... Launch Failed."
+		logger.info "Could not continue ... Launch Failed."
 	end
 
 	def pack_rails
 		# Remove server.pid if it exists
 		FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
 
-		puts "-----> Performing bundle install ... "
+		logger.info "Performing bundle install ..."
 		if system("bundle install --deployment --clean")
-			puts "-----> Installing Javascript Dependencies & Pre-compiling Assets ... "
+			logger.info "Installing Javascript Dependencies & Pre-compiling Assets ..."
 			if system("bundle exec rails assets:precompile", out: File::NULL)
-				puts "done"
-
-				puts "-----> Running Web Server ... "
+				logger.debug "Starting Server ..."
 				if system("god -c Godfile -D")
-					puts "-----> Launched Application ... Success."
+					logger.info "Launched Application ... Success."
 				end
 				# exit 0
 			end
-		end		
+		end
 	end
+	
+	def self.logger
+	  @logger ||= self.configure_logger_for(self.name)
+	end
+
+    def self.configure_logger_for(classname)
+		logger = ::Logger.new($stdout)
+		logger.level = ::Logger::DEBUG
+		logger.formatter = proc do |severity, datetime, progname, message|
+		  "\t\t\t-----> #{severity}: #{message}\n"
+		end
+		logger.progname = classname
+		logger
+    end	
 end
 
 buildpacker = Buildpacker.new

data/lib/smartcloud/grids/runner.rb

@@ -224,9 +224,8 @@ module Smartcloud
 				end
 				logger.level = ::Logger::DEBUG
 
+				# Load vars and environment
 				container_path = "#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/containers/#{appname}"
-
-				# Load ENV vars
 				return unless self.load_container_env_vars(container_path)
 
 				# Verify the user and ensure the user is correct and has access to this repository
@@ -291,23 +290,10 @@ module Smartcloud
 			end
 
 			def self.stop_app(appname)
-				if Smartcloud::Docker.running?
-					if system("docker inspect -f '{{.State.Running}}' #{appname}", [:out, :err] => File::NULL)
-						logger.debug "Stopping container #{appname} ..."
-						if system("docker stop '#{appname}'", out: File::NULL)
-							logger.debug "Removing container #{appname} ..."
-							if system("docker rm '#{appname}'", out: File::NULL)
-								logger.debug "Stopped & Removed #{appname} ..."
-							end
-						end
-					end
-				end
+				self.stop_container(appname)
 			end
 
 			def self.start_app_rails(appname, container_path, container_path_with_version)
-				# Stopping & Removing not required app containers
-				self.stop_app(appname)
-
 				logger.info "Ruby on Rails application detected."
 
 				# Setup rails env
@@ -328,10 +314,10 @@ module Smartcloud
 				# Setup Godfile
 				unless File.exist? "#{container_path_with_version}/Godfile"
 					logger.warn "WARNING: Godfile not detected. Adding a default Godfile. It is recommended to add your own Godfile."
-					page = <<~HEREDOC
+					page = <<~"HEREDOC"
 						God.watch do |w|
-							w.name = 'web'
-							w.start = 'bundle exec puma -C config/puma.rb'
+							w.name = "web"
+							w.start = "bundle exec puma -C config/puma.rb"
 							w.behavior(:clean_pid_file)
 							w.keepalive
 						end
@@ -340,8 +326,9 @@ module Smartcloud
 				end
 
 				# Creating & Starting container
+				self.stop_app("#{appname}_new")
 				if system("docker create \
-					--name='#{appname}' \
+					--name='#{appname}_new' \
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
 					--volume='#{container_path_with_version}:/code' \
@@ -351,20 +338,23 @@ module Smartcloud
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)
 
-					system("docker network connect solr-network #{appname}")
-					system("docker network connect mysql-network #{appname}")
+					system("docker network connect solr-network #{appname}_new")
+					system("docker network connect mysql-network #{appname}_new")
+
+					system("docker start --attach #{appname}_new")
+
+					# Runs only if #{appname}_new has been started successfully and is reachable.
+					# self.hot_reloading_app(appname)
+					# self.clean_up(container_path)
 
-					system("docker start --attach #{appname}")
-					self.clean_up(container_path)
+					# Runs only if #{appname}_new starting has failed.
+					# self.stop_app("#{appname}_new")
 				end
 			end
 
 			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
@@ -378,10 +368,30 @@ module Smartcloud
 				end
 			end
 
+			# Hot reloading app containers and removing old app container
+			def self.hot_reloading_app(appname)
+				logger.debug "Hot reloading '#{appname}' containers ..."
+
+				container_id = `docker ps -a -q --filter='name=^#{appname}$'`.chomp
+				unless container_id.empty?
+					if system("docker container rename #{appname} #{appname}_old", [:out, :err] => File::NULL)
+						logger.debug "Container renamed from #{appname} #{appname}_old"
+						if system("docker container rename #{appname}_new #{appname}", [:out, :err] => File::NULL)
+							logger.debug "Container renamed from #{appname}_new #{appname}"
+							self.stop_app("#{appname}_old")
+						end
+					end
+				else
+					if system("docker container rename #{appname}_new #{appname}", [:out, :err] => File::NULL)
+						logger.debug "Container renamed from #{appname}_new #{appname}"
+					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
+					return false
 				end
 
 				File.open("#{container_path}/env").each_line do |line|
@@ -393,6 +403,20 @@ module Smartcloud
 
 				true
 			end
+
+			def self.stop_container(container_name)
+				if Smartcloud::Docker.running?
+					container_id = `docker ps -a -q --filter='name=^#{container_name}$'`.chomp
+					unless container_id.empty?
+						logger.debug "Stopping & Removing container #{container_name} ..."
+						if system("docker stop #{container_name} && docker rm #{container_name}", out: File::NULL)
+							logger.debug "Stopped & Removed container #{container_name} ..."
+						end
+					else
+						logger.debug "Container '#{container_name}' does not exist to stop."
+					end
+				end
+			end
 		end
 	end
 end

metadata

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