From 160a8312d42098bed4f9dfce5a215a3a1c41a2f9 Mon Sep 17 00:00:00 2001 From: duratarskeyk Date: Tue, 15 Dec 2015 23:13:31 +0000 Subject: [PATCH] final changes --- RackMultipart20151215-7748-skmdad | 0 app/controllers/api/v1/jobs_controller.rb | 2 +- app/models/concerns/project/github_api.rb | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 RackMultipart20151215-7748-skmdad diff --git a/RackMultipart20151215-7748-skmdad b/RackMultipart20151215-7748-skmdad new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/api/v1/jobs_controller.rb b/app/controllers/api/v1/jobs_controller.rb index 1dd0f7459..cd5dda057 100644 --- a/app/controllers/api/v1/jobs_controller.rb +++ b/app/controllers/api/v1/jobs_controller.rb @@ -61,7 +61,7 @@ class Api::V1::JobsController < Api::V1::BaseController name = params[:name] if name =~ /abfworker::rpm-worker/ if current_user.system? || current_user.id == BuildList.where(id: name.gsub(/[^\d]/, '')).first.try(:builder_id) - BuildList.log_server.setex name, 15, params[:logs] + res = BuildList.log_server.setex name, 15, params[:logs] end end render nothing: true diff --git a/app/models/concerns/project/github_api.rb b/app/models/concerns/project/github_api.rb index f437c970d..36fbe760c 100644 --- a/app/models/concerns/project/github_api.rb +++ b/app/models/concerns/project/github_api.rb @@ -18,7 +18,7 @@ module Project::GithubApi end def github_get_organization - return APP_CONFIG['github_organization'] if github_organization.empty? - github_organization + return github_organization if github_organization.presence + APP_CONFIG['github_organization'] end end \ No newline at end of file