Skip to content

Commit 583c538

Browse files
Change parameters to initialize from BigBlueButtonApi
1 parent 5b994fc commit 583c538

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

lib/bigbluebutton_api.rb

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ class BigBlueButtonApi
5151
# API version e.g. 0.81
5252
attr_accessor :version
5353

54-
# Flag to turn on/off debug mode
55-
attr_accessor :debug
56-
5754
# logger to log reponses and infos
5855
attr_accessor :logger
5956

@@ -71,26 +68,25 @@ class BigBlueButtonApi
7168
# url:: URL to a BigBlueButton server (e.g. http://demo.bigbluebutton.org/bigbluebutton/api)
7269
# secret:: Shared secret for this server
7370
# version:: API version e.g. 0.81
74-
def initialize(url, secret, version=nil, debug=false)
71+
def initialize(url, secret, version=nil, logger=nil)
7572
@supported_versions = ['0.8', '0.81', '0.9', '1.0']
7673
@url = url
7774
@secret = secret
78-
@debug = debug
7975
@timeout = 10 # default timeout for api requests
8076
@request_headers = {} # http headers sent in all requests
81-
82-
@logger = Logger.new(STDOUT)
83-
@logger.level = Logger::DEBUG
84-
77+
@logger = logger
78+
if logger.nil?
79+
@logger = Logger.new(STDOUT)
80+
@logger.level = Logger::INFO
81+
end
82+
8583
version = nil if version && version.strip.empty?
8684
@version = nearest_version(version || get_api_version)
8785
unless @supported_versions.include?(@version)
8886
@logger.warn("BigBlueButtonAPI: detected unsupported version, using the closest one that is supported (#{@version})")
89-
# puts "BigBlueButtonAPI: detected unsupported version, using the closest one that is supported (#{@version})"
9087
end
9188

9289
@logger.debug("BigBlueButtonAPI: Using version #{@version}")
93-
# puts "BigBlueButtonAPI: Using version #{@version}" if @debug
9490
end
9591

9692
# Creates a new meeting. Returns the hash with the response or throws BigBlueButtonException
@@ -645,7 +641,7 @@ def check_url
645641
# API's are equal if all the following attributes are equal.
646642
def ==(other)
647643
r = true
648-
[:url, :supported_versions, :secret, :version, :debug].each do |param|
644+
[:url, :supported_versions, :secret, :version, :logger].each do |param|
649645
r = r && self.send(param) == other.send(param)
650646
end
651647
r
@@ -753,7 +749,6 @@ def send_api_request(method, params={}, data=nil, raw=false)
753749
def send_request(url, data=nil)
754750
begin
755751
@logger.debug("BigBlueButtonAPI: URL request = #{url}")
756-
# puts "BigBlueButtonAPI: URL request = #{url}" if @debug
757752
url_parsed = URI.parse(url)
758753
http = Net::HTTP.new(url_parsed.host, url_parsed.port)
759754
http.open_timeout = @timeout
@@ -764,13 +759,11 @@ def send_request(url, data=nil)
764759
response = http.get(url_parsed.request_uri, @request_headers)
765760
else
766761
@logger.debug("BigBlueButtonAPI: Sending as a POST request with data.size = #{data.size}")
767-
# puts "BigBlueButtonAPI: Sending as a POST request with data.size = #{data.size}" if @debug
768762
opts = { 'Content-Type' => 'application/xml' }.merge @request_headers
769763
response = http.post(url_parsed.request_uri, data, opts)
770764
end
771-
# @logger.debug("BigBlueButtonAPI: URL response = #{response.body}")
772765
@logger.info("BigBlueButtonAPI: request=#{url} response_status=#{response.class.name} response_code=#{response.code} message_key=#{response.message}")
773-
# puts "BigBlueButtonAPI: URL response = #{response.body}" if @debug
766+
@logger.debug("BigBlueButtonAPI: URL response = #{response.body}")
774767

775768
rescue Timeout::Error => error
776769
raise BigBlueButtonException.new("Timeout error. Your server is probably down: \"#{@url}\". Error: #{error}")

0 commit comments

Comments
 (0)