summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-06-23 11:04:37 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-06-23 11:08:00 +0200
commit339b79b07e6262e856332057dc73eca7a293dcc5 (patch)
tree54ac86e08365c920d310657a2eee730c4b09806b
parentc6f14956d64e726f613c0092587f97444beeebb7 (diff)
downloadgitlab-shell-gitlab-redis.tar.gz
Put Redis loading code in one placegitlab-redis
-rw-r--r--lib/gitlab_config.rb1
-rw-r--r--lib/gitlab_net.rb2
-rw-r--r--lib/gitlab_redis.rb2
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index 690c40e..ebf72d6 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -1,4 +1,3 @@
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
require 'yaml'
class GitlabConfig
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index 8e1fe39..e2bc2da 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -1,11 +1,11 @@
require 'net/http'
require 'openssl'
require 'json'
-require 'redis'
require_relative 'gitlab_config'
require_relative 'gitlab_logger'
require_relative 'gitlab_access'
+require_relative 'gitlab_redis'
require_relative 'httpunix'
class GitlabNet
diff --git a/lib/gitlab_redis.rb b/lib/gitlab_redis.rb
new file mode 100644
index 0000000..d34cc26
--- /dev/null
+++ b/lib/gitlab_redis.rb
@@ -0,0 +1,2 @@
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
+require 'redis'