Skip to content

Commit 10db300

Browse files
committed
Move Build::Info.log_level to Build.log_level
This information is used only during building. So it makes sense for it to stay in the Build module. Signed-off-by: Balasankar "Balu" C <[email protected]>
1 parent 3b92f00 commit 10db300

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

lib/gitlab/build.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
require_relative "build/info.rb"
1+
require_relative "util"
22

33
module Build
4+
def self.log_level
5+
if Gitlab::Util.get_env('BUILD_LOG_LEVEL') && !Gitlab::Util.get_env('BUILD_LOG_LEVEL').empty?
6+
Gitlab::Util.get_env('BUILD_LOG_LEVEL')
7+
else
8+
'info'
9+
end
10+
end
11+
412
def self.exec(project)
513
system(*cmd(project))
614
end
715

816
def self.cmd(project)
9-
%W[bundle exec omnibus build #{project} --log-level #{Info.log_level}]
17+
%W[bundle exec omnibus build #{project} --log-level #{log_level}]
1018
end
1119
end

lib/gitlab/build/info.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,3 @@
55
require_relative './info/package'
66
require_relative 'check'
77
require_relative 'image'
8-
9-
module Build
10-
class Info
11-
class << self
12-
def log_level
13-
if Gitlab::Util.get_env('BUILD_LOG_LEVEL') && !Gitlab::Util.get_env('BUILD_LOG_LEVEL').empty?
14-
Gitlab::Util.get_env('BUILD_LOG_LEVEL')
15-
else
16-
'info'
17-
end
18-
end
19-
end
20-
end
21-
end

0 commit comments

Comments
 (0)