mirror of
https://github.com/mistergibson/gxg-framework.git
synced 2026-08-15 03:46:00 -07:00
sqlite LoadError fix
This commit is contained in:
parent
fe0656b79c
commit
6010149d47
3 changed files with 7 additions and 4 deletions
|
|
@ -1,6 +1,6 @@
|
|||
Gem::Specification.new do |s|
|
||||
s.name = 'gxg-framework'
|
||||
s.version = '0.0.70'
|
||||
s.version = '0.0.71'
|
||||
s.licenses = ['HIPPOCRATIC 2.1', 'https://firstdonoharm.dev/version/2/1/license.html']
|
||||
s.summary = "GxG Framework"
|
||||
s.description = "GxG Framework"
|
||||
|
|
@ -23,6 +23,7 @@ Gem::Specification.new do |s|
|
|||
s.add_runtime_dependency 'prism', '= 1.6.0'
|
||||
if ::RUBY_ENGINE == "jruby"
|
||||
s.add_runtime_dependency 'jrzmq'
|
||||
s.add_runtime_dependency 'jruby-openssl', '~> 0.16'
|
||||
else
|
||||
# FIX : big hassle with windows - exclude for now
|
||||
# s.add_runtime_dependency 'ffi-rzmq'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
# See: https://github.com/jeremyevans/sequel
|
||||
if defined?(::External::Database::Sqlite)
|
||||
else
|
||||
unless ::RUBY_ENGINE == "jruby"
|
||||
if ::RUBY_ENGINE == "jruby"
|
||||
require 'jdbc/sqlite3'
|
||||
else
|
||||
require "sqlite3"
|
||||
end
|
||||
end
|
||||
|
|
@ -3912,8 +3912,8 @@ module GxG
|
|||
@status = :unavailable
|
||||
@services.each_pair do |service,endpoint|
|
||||
@clients[(service)] = ::GxG::Networking::GxGApi.new("gxg://#{@hostname}#{endpoint}")
|
||||
@clients[(service)].login(@uri.username, @uri.password)
|
||||
#
|
||||
# @clients[(service)].login(@uri.username, @uri.password)
|
||||
# might have to login to prime session --> not sure at this point
|
||||
end
|
||||
unless ::GxG::add_federation_server(self)
|
||||
raise Exception.new("Failure to register remote server #{@hostname.to_s}")
|
||||
|
|
|
|||
Loading…
Reference in a new issue