Skip to content

Commit c5bf21d

Browse files
committed
updating images for disco
1 parent 8359d1b commit c5bf21d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+88
-74
lines changed

Gemfile.lock

+30-23
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ GEM
3636
thread_safe (~> 0.3, >= 0.3.4)
3737
tzinfo (~> 1.1)
3838
arel (6.0.4)
39-
binding_of_caller (0.7.3)
39+
binding_of_caller (0.8.0)
4040
debug_inspector (>= 0.0.1)
4141
builder (3.2.3)
42-
byebug (9.1.0)
42+
byebug (10.0.2)
4343
coffee-rails (4.1.1)
4444
coffee-script (>= 2.2.0)
4545
railties (>= 4.0.0, < 5.1.x)
@@ -48,36 +48,38 @@ GEM
4848
execjs
4949
coffee-script-source (1.12.2)
5050
concurrent-ruby (1.0.5)
51-
crass (1.0.3)
51+
crass (1.0.4)
52+
daemons (1.2.6)
5253
debug_inspector (0.0.3)
5354
erubis (2.7.0)
55+
eventmachine (1.2.7)
5456
execjs (2.7.0)
55-
ffi (1.9.18)
57+
ffi (1.9.25)
5658
globalid (0.4.1)
5759
activesupport (>= 4.2.0)
58-
i18n (0.9.1)
60+
i18n (0.9.5)
5961
concurrent-ruby (~> 1.0)
6062
jbuilder (2.7.0)
6163
activesupport (>= 4.2.0)
6264
multi_json (>= 1.2)
63-
jquery-rails (4.3.1)
65+
jquery-rails (4.3.3)
6466
rails-dom-testing (>= 1, < 3)
6567
railties (>= 4.2.0)
6668
thor (>= 0.14, < 2.0)
6769
json (1.8.6)
68-
libv8 (3.16.14.19-x86_64-linux)
69-
loofah (2.1.1)
70+
libv8 (3.16.14.19)
71+
loofah (2.2.2)
7072
crass (~> 1.0.2)
7173
nokogiri (>= 1.5.9)
7274
mail (2.7.0)
7375
mini_mime (>= 0.1.1)
7476
mini_mime (1.0.0)
7577
mini_portile2 (2.3.0)
76-
minitest (5.10.3)
77-
multi_json (1.12.2)
78-
nokogiri (1.8.1)
78+
minitest (5.11.3)
79+
multi_json (1.13.1)
80+
nokogiri (1.8.4)
7981
mini_portile2 (~> 2.3.0)
80-
rack (1.6.8)
82+
rack (1.6.10)
8183
rack-test (0.6.3)
8284
rack (>= 1.0)
8385
rails (4.2.10)
@@ -97,20 +99,20 @@ GEM
9799
activesupport (>= 4.2.0, < 5.0)
98100
nokogiri (~> 1.6)
99101
rails-deprecated_sanitizer (>= 1.0.1)
100-
rails-html-sanitizer (1.0.3)
101-
loofah (~> 2.0)
102+
rails-html-sanitizer (1.0.4)
103+
loofah (~> 2.2, >= 2.2.2)
102104
railties (4.2.10)
103105
actionpack (= 4.2.10)
104106
activesupport (= 4.2.10)
105107
rake (>= 0.8.7)
106108
thor (>= 0.18.1, < 2.0)
107-
rake (12.3.0)
108-
rb-fsevent (0.10.2)
109+
rake (12.3.1)
110+
rb-fsevent (0.10.3)
109111
rb-inotify (0.9.10)
110112
ffi (>= 0.5.0, < 2)
111113
rdoc (4.3.0)
112114
ref (2.0.0)
113-
sass (3.5.4)
115+
sass (3.5.7)
114116
sass-listen (~> 4.0.0)
115117
sass-listen (4.0.0)
116118
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -126,7 +128,7 @@ GEM
126128
rdoc (~> 4.0)
127129
spring (2.0.2)
128130
activesupport (>= 4.2)
129-
sprockets (3.7.1)
131+
sprockets (3.7.2)
130132
concurrent-ruby (~> 1.0)
131133
rack (> 1, < 3)
132134
sprockets-rails (3.2.1)
@@ -137,15 +139,19 @@ GEM
137139
therubyracer (0.12.3)
138140
libv8 (~> 3.16.14.15)
139141
ref
142+
thin (1.7.2)
143+
daemons (~> 1.0, >= 1.0.9)
144+
eventmachine (~> 1.0, >= 1.0.4)
145+
rack (>= 1, < 3)
140146
thor (0.20.0)
141147
thread_safe (0.3.6)
142148
tilt (2.0.8)
143-
turbolinks (5.0.1)
144-
turbolinks-source (~> 5)
145-
turbolinks-source (5.0.3)
146-
tzinfo (1.2.4)
149+
turbolinks (5.1.1)
150+
turbolinks-source (~> 5.1)
151+
turbolinks-source (5.1.0)
152+
tzinfo (1.2.5)
147153
thread_safe (~> 0.1)
148-
uglifier (4.0.2)
154+
uglifier (4.1.18)
149155
execjs (>= 0.3.0, < 3)
150156
web-console (2.3.0)
151157
activemodel (>= 4.0)
@@ -168,6 +174,7 @@ DEPENDENCIES
168174
spring
169175
sqlite3
170176
therubyracer
177+
thin
171178
turbolinks
172179
uglifier (>= 1.3.0)
173180
web-console (~> 2.0)

app/assets/images/a-N-a.svg

+1-1

app/assets/images/a-N-b.svg

+1-1

app/assets/images/a-N-c.svg

+1-1

app/assets/images/a-a-N.svg

+1-1

app/assets/images/a-a-a.svg

+1-1

app/assets/images/a-a-b.svg

+1-1

app/assets/images/a-a-c.svg

+1-1

app/assets/images/a-b-N.svg

+1-1

app/assets/images/a-b-a.svg

+1-1

app/assets/images/a-b-b.svg

+1-1

app/assets/images/a-b-c.svg

+1-1

app/assets/images/a-c-N.svg

+1-1

app/assets/images/a-c-a.svg

+1-1

app/assets/images/a-c-b.svg

+1-1

app/assets/images/a-c-c.svg

+1-1

app/assets/images/b-N-a.svg

+1-1

app/assets/images/b-N-b.svg

+1-1

app/assets/images/b-N-c.svg

+1-1

app/assets/images/b-a-N.svg

+1-1

app/assets/images/b-a-a.svg

+1-1

app/assets/images/b-a-b.svg

+1-1

app/assets/images/b-a-c.svg

+1-1

app/assets/images/b-b-N.svg

+1-1

app/assets/images/b-b-a.svg

+1-1

app/assets/images/b-b-b.svg

+1-1

app/assets/images/b-b-c.svg

+1-1

app/assets/images/b-c-N.svg

+1-1

app/assets/images/b-c-a.svg

+1-1

app/assets/images/b-c-b.svg

+1-1

app/assets/images/b-c-c.svg

+1-1

app/assets/images/c-N-a.svg

+1-1

app/assets/images/c-N-b.svg

+1-1

app/assets/images/c-N-c.svg

+1-1

app/assets/images/c-a-N.svg

+1-1

app/assets/images/c-a-a.svg

+1-1

app/assets/images/c-a-b.svg

+1-1

app/assets/images/c-a-c.svg

+1-1

app/assets/images/c-b-N.svg

+1-1

app/assets/images/c-b-a.svg

+1-1

app/assets/images/c-b-b.svg

+1-1

app/assets/images/c-b-c.svg

+1-1

app/assets/images/c-c-N.svg

+1-1

app/assets/images/c-c-a.svg

+1-1

app/assets/images/c-c-b.svg

+1-1

app/assets/images/c-c-c.svg

+1-1

app/controllers/application_controller.rb

+11-5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ def index
2121
@text = "no backend found"
2222
end
2323

24+
rescue => e
25+
logger.error e.message
26+
logger.error e.backtrace.join("\n")
27+
@text = "no backend found"
28+
end
29+
30+
begin
2431
crystalreq = Net::HTTP::Get.new(crystal_uri.to_s)
2532
crystalres = Net::HTTP.start(crystal_uri.host, crystal_uri.port) {|http|
2633
http.request(crystalreq)
@@ -35,7 +42,6 @@ def index
3542
rescue => e
3643
logger.error e.message
3744
logger.error e.backtrace.join("\n")
38-
@text = "no backend found"
3945
@crystal = "no backend found"
4046
end
4147
end
@@ -52,15 +58,15 @@ def crystal_uri
5258
def nodejs_uri
5359
expand_url ENV["NODEJS_URL"]
5460
end
55-
61+
5662
# Resolve the SRV records for the hostname in the URL
5763
def expand_url(url)
5864
uri = URI(url)
5965
resolver = Resolv::DNS.new()
60-
66+
6167
# if host is relative, append the service discovery name
6268
host = uri.host.count('.') > 0 ? uri.host : "#{uri.host}.#{ENV["_SERVICE_DISCOVERY_NAME"]}"
63-
69+
6470
# lookup the SRV record and use if found
6571
begin
6672
srv = resolver.getresource(host, Resolv::DNS::Resource::IN::SRV)
@@ -70,7 +76,7 @@ def expand_url(url)
7076
logger.error e.message
7177
logger.error e.backtrace.join("\n")
7278
end
73-
79+
7480
logger.info "expanded #{url} to #{uri}"
7581
uri
7682
end

mu.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ service:
55
port: 3000
66
pathPatterns:
77
- /*
8+
discoveryTTL: 5
89
environment:
910
CRYSTAL_URL: "http://ecsdemo-crystal/crystal"
10-
NODEJS_URL: "http://ecsdemo-nodejs/"
11+
NODEJS_URL: "http://ecsdemo-nodejs/"

0 commit comments

Comments
 (0)