upfluence-utils 0.9.1 → 0.9.2
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 35be0f17a3c73784afa8e178a740bed54d6491d182d592177904bbfbf31e0b83
|
4
|
+
data.tar.gz: 9d7bebee3fbdead4d8b32e3314adbfba61e282811249b023fc2d0488dfb0a538
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 423c2ef58a5363705bb5f90ec629648000a2d25c14c2536da02afb1def3f14c946db657ca244887ec3cc5400d2b78feaf6be5c92103b8853a0af420cdf6bbffc
|
7
|
+
data.tar.gz: e559829e31729eaa0ed30bde6d3d4fcda417d7833324a93c1ac923e4bf9e8ff3fcbf0abd0b4f0357f4c967e2d9a9b165d1c33c2fe542a4bb9f36ac5212ac836c
|
@@ -4,10 +4,7 @@ module Upfluence
|
|
4
4
|
class ApplicationHeaders
|
5
5
|
def initialize(app, handler)
|
6
6
|
@app = app
|
7
|
-
@headers = {
|
8
|
-
"X-Upfluence-Unit-Name" => handler.getName,
|
9
|
-
"X-Upfluence-Version" => build_version(handler.getVersion)
|
10
|
-
}
|
7
|
+
@headers = handler ? build_headers(handler) : {}
|
11
8
|
end
|
12
9
|
|
13
10
|
def call(env)
|
@@ -17,14 +14,19 @@ module Upfluence
|
|
17
14
|
|
18
15
|
private
|
19
16
|
|
17
|
+
def build_headers(handler)
|
18
|
+
{
|
19
|
+
'X-Upfluence-Unit-Name' => handler.getName,
|
20
|
+
'X-Upfluence-Version' => build_version(handler.getVersion)
|
21
|
+
}
|
22
|
+
end
|
23
|
+
|
20
24
|
def build_version(thrift_version)
|
21
|
-
|
22
|
-
|
23
|
-
end
|
25
|
+
v = thrift_version.semantic_version
|
26
|
+
return "v#{v.major}.#{v.minor}.#{v.patch}" if v
|
24
27
|
|
25
|
-
|
26
|
-
|
27
|
-
end
|
28
|
+
v = thrift_version.git_version
|
29
|
+
return "v0.0.0-#{v.commit}" if v
|
28
30
|
|
29
31
|
'undefined'
|
30
32
|
end
|
@@ -36,6 +36,11 @@ module Upfluence
|
|
36
36
|
def initialize(options = {}, &block)
|
37
37
|
@options = DEFAULT_OPTIONS.dup.merge(options)
|
38
38
|
opts = @options
|
39
|
+
base_handler = nil
|
40
|
+
|
41
|
+
if opts[:base_handler_klass]
|
42
|
+
base_handler = opts[:base_handler_klass].new(@options[:interfaces])
|
43
|
+
end
|
39
44
|
|
40
45
|
@builder = Builder.new do
|
41
46
|
use Middleware::Logger
|
@@ -54,12 +59,9 @@ module Upfluence
|
|
54
59
|
run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
|
55
60
|
end
|
56
61
|
|
57
|
-
if opts[:base_processor_klass] &&
|
62
|
+
if opts[:base_processor_klass] && base_handler
|
58
63
|
map '/base' do
|
59
|
-
run_thrift(
|
60
|
-
opts[:base_processor_klass],
|
61
|
-
opts[:base_handler_klass].new(@options[:interfaces])
|
62
|
-
)
|
64
|
+
run_thrift(opts[:base_processor_klass], base_handler)
|
63
65
|
end
|
64
66
|
end
|
65
67
|
|