From 4fa54c8008def8e5ac44700d3040a7d671b99bd5 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Wed, 27 Jun 2018 15:21:15 -0700 Subject: [PATCH] Move net/ldap require into vmpooler.rb This commit moves net/ldap require from authenticate_ldap in api/helpers to vmpooler.rb. Without this change net/ldap and rubygems are required again every time authenticate_ldap is run. --- lib/vmpooler.rb | 1 + lib/vmpooler/api/helpers.rb | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb index a1c757b..73042d9 100644 --- a/lib/vmpooler.rb +++ b/lib/vmpooler.rb @@ -4,6 +4,7 @@ module Vmpooler require 'date' require 'json' require 'open-uri' + require 'net/ldap' require 'rbvmomi' require 'redis' require 'sinatra/base' diff --git a/lib/vmpooler/api/helpers.rb b/lib/vmpooler/api/helpers.rb index 7575b6d..34bf5b6 100644 --- a/lib/vmpooler/api/helpers.rb +++ b/lib/vmpooler/api/helpers.rb @@ -55,9 +55,6 @@ module Vmpooler end def authenticate_ldap(port, host, user_object, base, username_str, password_str) - require 'rubygems' - require 'net/ldap' - ldap = Net::LDAP.new( :host => host, :port => port,