cassie 1.0.0.alpha.16 → 1.0.0.alpha.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cassie/connection_handler/README.md +2 -2
- data/lib/cassie/connection_handler/cluster.rb +13 -1
- data/lib/cassie/connection_handler/sessions.rb +10 -1
- data/lib/cassie/{queries/logging/logger.rb → logger.rb} +5 -5
- data/lib/cassie/queries/logging.rb +1 -2
- data/lib/cassie.rb +9 -0
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1db615986664ba9778d7e97248400a71ff53bc5d
|
4
|
+
data.tar.gz: 717c516823cfef09d656843aabd7f271beec5b93
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c9acfa78a37ed8a612aec6a8e3f424f6bfd8f25b8f0667791e9025b7d7c85f250bae8dde1dd520c386134d23bd4f1a0a71df49958abf61c002f951f8c4aab28e
|
7
|
+
data.tar.gz: 00013b88d5c35b2a729c9197a6805270f45b6d09718a094b50d9d785bec1683ffb5186db6ee088bcaf8f7117b0e0f69e709ece7db6e5e64c9b4121e872ac4f75
|
@@ -95,7 +95,7 @@ Cassie.keyspace
|
|
95
95
|
object = Analytics::HelpfulCounter.new
|
96
96
|
|
97
97
|
object.keyspace
|
98
|
-
=>
|
98
|
+
=> :analytics_keyspace
|
99
99
|
|
100
100
|
object.user_count
|
101
101
|
=> 300715
|
@@ -104,7 +104,7 @@ object.user_count
|
|
104
104
|
|
105
105
|
Or at the object level
|
106
106
|
|
107
|
-
```
|
107
|
+
```ruby
|
108
108
|
Cassie.keyspace
|
109
109
|
=> "default_keyspace"
|
110
110
|
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'benchmark'
|
2
|
+
|
1
3
|
module Cassie::ConnectionHandler
|
2
4
|
module Cluster
|
3
5
|
|
@@ -5,7 +7,17 @@ module Cassie::ConnectionHandler
|
|
5
7
|
# Cassandra::cluster parses suppored
|
6
8
|
# options from the passed hash, no need
|
7
9
|
# to validate/transform ourselves yet
|
8
|
-
@cluster ||=
|
10
|
+
@cluster ||= begin
|
11
|
+
_cluster = nil
|
12
|
+
config = configuration.try(:symbolize_keys)
|
13
|
+
|
14
|
+
sec = Benchmark.realtime do
|
15
|
+
_cluster = Cassandra.cluster(config)
|
16
|
+
end
|
17
|
+
|
18
|
+
logger.info "Connected to Cassandra cluster #{config[:hosts]} (#{sec.round(3)}s)"
|
19
|
+
_cluster
|
20
|
+
end
|
9
21
|
end
|
10
22
|
end
|
11
23
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'benchmark'
|
2
|
+
|
1
3
|
module Cassie::ConnectionHandler
|
2
4
|
module Sessions
|
3
5
|
|
@@ -12,7 +14,14 @@ module Cassie::ConnectionHandler
|
|
12
14
|
protected
|
13
15
|
|
14
16
|
def connect(_keyspace)
|
15
|
-
|
17
|
+
_session = nil
|
18
|
+
|
19
|
+
sec = Benchmark.realtime do
|
20
|
+
_session = cluster.connect(_keyspace)
|
21
|
+
end
|
22
|
+
|
23
|
+
logger.info "Session opened to Cassandra[#{_keyspace}] (#{sec.round(3)}s)"
|
24
|
+
@sessions[_keyspace] = _session
|
16
25
|
end
|
17
26
|
end
|
18
27
|
end
|
@@ -1,19 +1,19 @@
|
|
1
|
-
module Cassie
|
2
|
-
module
|
1
|
+
module Cassie
|
2
|
+
module Logger
|
3
3
|
|
4
4
|
def self.logger
|
5
5
|
@logger ||= init_logger
|
6
6
|
end
|
7
7
|
|
8
8
|
def self.logger=(new_logger)
|
9
|
-
@logger = new_logger || Logger.new('/dev/null')
|
9
|
+
@logger = new_logger || ::Logger.new('/dev/null')
|
10
10
|
end
|
11
11
|
|
12
12
|
def self.init_logger(target = STDOUT)
|
13
13
|
previous_logger = defined?(@logger) ? @logger : nil
|
14
14
|
|
15
|
-
@logger = Logger.new(target)
|
16
|
-
@logger.level = Logger::INFO
|
15
|
+
@logger = ::Logger.new(target)
|
16
|
+
@logger.level = ::Logger::INFO
|
17
17
|
@logger.formatter = log_formatter
|
18
18
|
|
19
19
|
previous_logger.close if previous_logger
|
@@ -1,4 +1,3 @@
|
|
1
|
-
require_relative 'logging/logger'
|
2
1
|
require_relative 'logging/subscription'
|
3
2
|
|
4
3
|
module Cassie::Queries
|
@@ -11,7 +10,7 @@ module Cassie::Queries
|
|
11
10
|
|
12
11
|
module ClassMethods
|
13
12
|
def logger
|
14
|
-
Cassie
|
13
|
+
Cassie.logger
|
15
14
|
end
|
16
15
|
end
|
17
16
|
|
data/lib/cassie.rb
CHANGED
@@ -12,6 +12,7 @@ require 'active_support'
|
|
12
12
|
require 'cassandra'
|
13
13
|
|
14
14
|
module Cassie
|
15
|
+
require_relative 'cassie/logger'
|
15
16
|
require_relative 'cassie/configuration'
|
16
17
|
require_relative 'cassie/connection_handler'
|
17
18
|
require_relative 'cassie/connection'
|
@@ -19,4 +20,12 @@ module Cassie
|
|
19
20
|
|
20
21
|
extend Configuration::Core
|
21
22
|
extend ConnectionHandler
|
23
|
+
|
24
|
+
def self.logger
|
25
|
+
Logger.logger
|
26
|
+
end
|
27
|
+
|
28
|
+
def self.logger=(logger)
|
29
|
+
Logger.logger = logger
|
30
|
+
end
|
22
31
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cassie
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.0.alpha.
|
4
|
+
version: 1.0.0.alpha.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Evan Prothro
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-03-
|
11
|
+
date: 2016-03-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: cassandra-driver
|
@@ -117,11 +117,11 @@ files:
|
|
117
117
|
- lib/cassie/connection_handler/README.md
|
118
118
|
- lib/cassie/connection_handler/cluster.rb
|
119
119
|
- lib/cassie/connection_handler/sessions.rb
|
120
|
+
- lib/cassie/logger.rb
|
120
121
|
- lib/cassie/queries/README.md
|
121
122
|
- lib/cassie/queries/instrumentation.rb
|
122
123
|
- lib/cassie/queries/logging.rb
|
123
124
|
- lib/cassie/queries/logging/cql_execution_event.rb
|
124
|
-
- lib/cassie/queries/logging/logger.rb
|
125
125
|
- lib/cassie/queries/logging/subscription.rb
|
126
126
|
- lib/cassie/queries/statement.rb
|
127
127
|
- lib/cassie/queries/statement/assignment.rb
|