Merge pull request #7 from KingsGambitLab/scaler/fixing_logs

fixing the redirection path for the logs

Author: nikhilagarwal01

app/controllers/rake_ui/rake_task_logs_controller.rb

@@ -2,6 +2,8 @@
 
 module RakeUi
   class RakeTaskLogsController < ApplicationController
+    include RakeUi::S3Client
+
     RAKE_TASK_LOG_ATTRS = [:id,
       :name,
       :args,
@@ -25,17 +27,16 @@ def index
     end
 
     def show
-      @rake_task_log = RakeUi::RakeTaskLog.find_by_id(params[:id])
-
-      @rake_task_log_content = @rake_task_log.file_contents.gsub("\n", "<br />")
-      @rake_task_log_content_url = rake_task_log_path(@rake_task_log.id, format: :json)
-      @is_rake_task_log_finished = @rake_task_log.finished?
+      key_name = "#{params[:id]}.txt"
+      @file_contents_from_s3 = RakeUi::S3Client.get_object_from_s3(bucket: S3_BUCKET, key: key_name)
+      @rake_task_log_content = @file_contents_from_s3.gsub("\n", '<br />')
+      @rake_task_log_content_url = rake_task_log_path(params[:id], format: :json)
+      @is_rake_task_log_finished = @file_contents_from_s3.include?(RakeUi::RakeTaskLog::FINISHED_STRING)
 
       respond_to do |format|
         format.html
         format.json do
           render json: {
-            rake_task_log: rake_task_log_as_json(@rake_task_log),
             rake_task_log_content: @rake_task_log_content,
             rake_task_log_content_url: @rake_task_log_content_url,
             is_rake_task_log_finished: @is_rake_task_log_finished

app/models/rake_ui/rake_task.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 module RakeUi
-  S3_BUCKET = Rails.env.production? ? 'rakeuilogs'.freeze : 'rakeuilogstest'.freeze
   class RakeTask
+    include RakeUi::S3Client
+
     def self.to_safe_identifier(id)
       CGI.escape(id)
     end
@@ -127,7 +128,7 @@ def build_rake_command(args: nil, environment: nil)
         command += "#{environment} "
       end
 
-      command += "rake #{name}"
+      command += "bundle exec rake #{name}"
 
       if args
         command += "[#{args}]"

app/modules/rake_ui/s3_client.rb

@@ -1,5 +1,7 @@
 module RakeUi
   module S3Client
+
+    S3_BUCKET = Rails.env.production? ? 'rakeuilogs'.freeze : 'rakeuilogstest'.freeze
     class << self
 
       def s3_client