rails_multisite 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b91ecd19c63a8bd3634436ba33604e1a2feb4a9
-  data.tar.gz: 3b9b415a943a1c85cf1720c6d322c50aa0d98947
+  metadata.gz: 9125f561ab7f58fb9685d8a1ef7501add2dc2617
+  data.tar.gz: 6e1cda42fb46f76466b3828fd7f8a7c27054dc34
 SHA512:
-  metadata.gz: 37dbdf795601d4725c45cf797accf5fe32e312683700a16555c316d4d5d969919a0df7e73336d16eb230675b7383841ed896044b37e4234e67bf8d79c03a20bf
-  data.tar.gz: 43c6c2ae975e6361670d277a180796d16d4d1a57bde686d36ca9f5ae3642e57343ab079fd49f1e51d567f4efd33fbc424c7bdf06ac5eaff44c6553c157575f6f
+  metadata.gz: 20bbec27a4d049bb250257bf6b3c3a354ff70617cac6eec973a1a64a8e888bea80ddfd9e169a1612d273059b20bb1400e22bbdd639c90e26d0c22ad80f5b4444
+  data.tar.gz: 37fa6cdbe00e7d32e20d8b10bac38e4f02350f3c6a2dd18f651c664caedebd3a8ea50e03143e0fcb57f7fb88b56a6f9063fd2af0b39eb69f7af0aad4824ad88e

data/README.md

@@ -6,7 +6,7 @@ Using its middleware you can partition your app so each hostname has its own db.
 
 It provides a series of helper for working with multiple database, and some additional rails tasks for working with them.
 
-It was extracted from Discourse. http://discourse.org
+It was extracted from Discourse. https://discourse.org
 
 ## Installation
 
@@ -26,8 +26,35 @@ Or install it yourself as:
 
 Configuration requires a file called: `config/multisite.yml` that specifies connection specs for all dbs.
 
+```
+mlp:
+  adapter: postgresql
+  database: discourse_mlp
+  username: discourse_mlp
+  password: applejack
+  host: dbhost
+  pool: 5
+  timeout: 5000
+  db_id: 1  # ensure db_id is unique for each site
+  host_names:
+    - discourse.equestria.com
+    - discourse.equestria.internal
+
+drwho:
+  adapter: postgresql
+  database: discourse_who
+  username: discourse_who
+  password: "Up the time stream without a TARDIS"
+  host: dbhost
+  pool: 5
+  timeout: 5000
+  db_id: 2# ensure db_id is unique for each site
+  host_names:
+    - discuss.tardis.gallifrey
+```
+
 
-### Exectue a query on each connection
+### Execute a query on each connection
 
 ```
 RailsMultisite::ConnectionManagement.each_connection do |db|

data/lib/rails_multisite.rb

@@ -1,3 +1,4 @@
 require "rails_multisite/version"
 require "rails_multisite/railtie"
+require "rails_multisite/formatter"
 require "rails_multisite/connection_management"

data/lib/rails_multisite/connection_management.rb

@@ -61,7 +61,7 @@ module RailsMultisite
       rval
     end
 
-    def self.with_connection(db = "default")
+    def self.with_connection(db = DEFAULT)
       old = current_db
       connected = ActiveRecord::Base.connection_pool.connected?
 
@@ -137,7 +137,7 @@ module RailsMultisite
     end
 
     def self.all_dbs
-      ["default"] +
+      [DEFAULT] +
         if defined?(@@db_spec_cache) && @@db_spec_cache
           @@db_spec_cache.keys.to_a
         else
@@ -146,7 +146,7 @@ module RailsMultisite
     end
 
     def self.current_db
-      ActiveRecord::Base.connection_pool.spec.config[:db_key] || "default"
+      ActiveRecord::Base.connection_pool.spec.config[:db_key] || DEFAULT
     end
 
     def self.config_filename=(config_filename)
@@ -175,7 +175,7 @@ module RailsMultisite
       no_prepared_statements = ActiveRecord::Base.configurations[Rails.env]["prepared_statements"] == false
 
       configs.each do |k,v|
-        raise ArgumentError.new("Please do not name any db default!") if k == "default"
+        raise ArgumentError.new("Please do not name any db default!") if k == DEFAULT
         v[:db_key] = k
         v[:prepared_statements] = false if no_prepared_statements
       end

data/lib/rails_multisite/formatter.rb

@@ -0,0 +1,7 @@
+module RailsMultisite
+  class Formatter < ::ActiveSupport::Logger::SimpleFormatter
+    def call(severity, timestamp, progname, msg)
+      "[#{RailsMultisite::ConnectionManagement.current_db}] #{super}"
+    end
+  end
+end

data/lib/rails_multisite/railtie.rb

@@ -8,6 +8,7 @@ module RailsMultisite
       Rails.configuration.multisite = false
       if File.exists?(ConnectionManagement.config_filename)
         Rails.configuration.multisite = true
+        Rails.logger.formatter = RailsMultisite::Formatter.new
         ConnectionManagement.load_settings!
         app.middleware.insert_after(ActiveRecord::ConnectionAdapters::ConnectionManagement, RailsMultisite::ConnectionManagement)
         app.middleware.delete(ActiveRecord::ConnectionAdapters::ConnectionManagement)
@@ -16,8 +17,6 @@ module RailsMultisite
         end
       end
     end
-
-
   end
 end
 

data/lib/rails_multisite/version.rb

@@ -1,3 +1,3 @@
 module RailsMultisite
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multisite
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies: []
 description: Multi tenancy support for Rails
 email:
@@ -21,6 +21,7 @@ files:
 - README.md
 - lib/rails_multisite.rb
 - lib/rails_multisite/connection_management.rb
+- lib/rails_multisite/formatter.rb
 - lib/rails_multisite/railtie.rb
 - lib/rails_multisite/version.rb
 - lib/tasks/db.rake
@@ -44,8 +45,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Multi tenancy support for Rails
 test_files: []
+has_rdoc: