rest-ftp-daemon 0.220.4 → 0.221

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +4 -4
  3. data/lib/rest-ftp-daemon/constants.rb +1 -1
  4. data/lib/rest-ftp-daemon/static/css/main.css +41 -21
  5. data/lib/rest-ftp-daemon/views/dashboard.haml +24 -6
  6. data/lib/rest-ftp-daemon/views/dashboard_infos.haml +19 -0
  7. data/lib/rest-ftp-daemon/views/dashboard_jobs.haml +4 -4
  8. data/lib/rest-ftp-daemon/views/{dashboard_headers.haml → dashboard_status.haml} +3 -15
  9. data/lib/rest-ftp-daemon/views/dashboard_table.haml +0 -1
  10. data/lib/rest-ftp-daemon/worker_job.rb +3 -0
  11. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e32694d3be7cd99f54730ab7cf523baaa414b010
4
- data.tar.gz: 7f2dd8a34044b2d6cb03b6f6c03031abad34f894
3
+ metadata.gz: fa2898557667a162460cbbf4c682dfc9bfcf05f7
4
+ data.tar.gz: 9f435fbe56c23978e7302649db5eef6312871e14
5
5
  SHA512:
6
- metadata.gz: f2a57d6e02576348f30ac149c0622f6bb3fddee2c9d4b5eeaf8427c66af480e2daa39db963132f7e1ee0d89f2433b0254ab3a85af0fcc78d126b3aa2b1bdf6c2
7
- data.tar.gz: 412246af911a5d06d59ed4c0bd1c862977c6154eb383912c8468d5caee87d158520de7deb3cf373f065cf1f288776f107345a1e50b5817569797d5acc3907774
6
+ metadata.gz: d4690191c0a025de1924e6ff8014c6b2a58fed13bf69766a3cca7f60bf863d91723d831a4d426e6d69c8604f8f52f1263f6908c20d6386c0ffd08bb7faf6b08f
7
+ data.tar.gz: 0f8717306bf40859bbeabd0908942170321b8f8912d09e71677a1c2d2b5861c8ad21e9039d81f166f1d4499d1491ef17aa588d9b399b422aaec7c6bf8bd4c626
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rest-ftp-daemon (0.220.4)
4
+ rest-ftp-daemon (0.221)
5
5
  double-bag-ftps
6
6
  facter
7
7
  get_process_mem
@@ -38,7 +38,7 @@ GEM
38
38
  double-bag-ftps (0.1.2)
39
39
  equalizer (0.0.11)
40
40
  eventmachine (1.0.7)
41
- facter (2.4.3)
41
+ facter (2.4.4)
42
42
  CFPropertyList (~> 2.2.6)
43
43
  ffi (1.9.8)
44
44
  get_process_mem (0.2.0)
@@ -64,8 +64,8 @@ GEM
64
64
  minitest (5.6.1)
65
65
  multi_json (1.11.0)
66
66
  multi_xml (0.5.5)
67
- newrelic_rpm (3.11.2.286)
68
- rack (1.6.0)
67
+ newrelic_rpm (3.12.0.288)
68
+ rack (1.6.1)
69
69
  rack-accept (0.4.5)
70
70
  rack (>= 0.4)
71
71
  rack-mount (0.8.3)
data/lib/rest-ftp-daemon/constants.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # Terrific constants
2
2
  APP_NAME = "rest-ftp-daemon"
3
3
  APP_NICK = "rftpd"
4
- APP_VER = "0.220.4"
4
+ APP_VER = "0.221"
5
5
 
6
6
 
7
7
  # Jobs and workers
data/lib/rest-ftp-daemon/static/css/main.css CHANGED
@@ -1,21 +1,14 @@
1
+ /* Common styles
2
+ -------------------------------------------------- */
1
3
  .text-right {
2
4
  text-align: right;
3
5
  }
4
6
 
5
- .transfer-method {
6
- /*width: 35px;*/
7
- }
8
-
9
- .worker-label {
10
- /*width: 25px;*/
11
- }
12
-
13
7
  .nobr {
14
8
  white-space: nowrap;
15
9
  }
16
10
 
17
11
  body, table tr td, .fixed {
18
- /*font-family: 'Inconsolata', Verdana, sans-serif;*/
19
12
  font-family: 'Verdana', Verdana, sans-serif;
20
13
  font-size: 1em;
21
14
  }
@@ -24,7 +17,6 @@ body, table tr td, .fixed {
24
17
  display: inline-block;
25
18
  background-color: #f8f8f8;
26
19
  padding: 0 2px;
27
- /*font-weight: bold;*/
28
20
  }
29
21
 
30
22
  .label {
@@ -53,12 +45,6 @@ h2 {
53
45
  margin-top: 2em;
54
46
  }
55
47
 
56
- #header {
57
- padding: 20px auto;
58
- border-bottom: 1px solid silver;
59
- background-color: #eee;
60
- }
61
-
62
48
  .progress {
63
49
  margin-bottom: 0;
64
50
  /*min-width: 60px;*/
@@ -69,11 +55,6 @@ a.class {
69
55
  }
70
56
 
71
57
 
72
- a.page.btn {
73
- /*font-weight: bold;*/
74
- /*font-size: 1.5em;*/
75
- }
76
-
77
58
  .debug {
78
59
  border: 1px solid orange;
79
60
  }
@@ -87,3 +68,42 @@ a.page.btn {
87
68
  }
88
69
 
89
70
 
71
+
72
+
73
+
74
+ /* Header styles
75
+ -------------------------------------------------- */
76
+ .header-indicators {
77
+ /*border: 1px solid red;*/
78
+ margin-top: 20px;
79
+ margin-bottom: 4px;
80
+ }
81
+
82
+
83
+ /* Footer styles
84
+ -------------------------------------------------- */
85
+ html {
86
+ position: relative;
87
+ min-height: 100%;
88
+ }
89
+ body {
90
+ margin-bottom: 40px;
91
+ }
92
+ .footer {
93
+ position: absolute;
94
+ bottom: 0;
95
+ width: 100%;
96
+ height: 40px;
97
+ background-color: #f5f5f5;
98
+ border-top: 1px solid #e7e7e7;
99
+ }
100
+ .footer-signature {
101
+ /*border: 1px solid blue;*/
102
+ margin-top: 12px;
103
+ }
104
+
105
+ .footer-indicators {
106
+ /*border: 1px solid blue;*/
107
+ margin-top: 5px;
108
+ /*margin-bottom: 2px;*/
109
+ }
data/lib/rest-ftp-daemon/views/dashboard.haml CHANGED
@@ -19,16 +19,18 @@
19
19
  = "v#{APP_VER}"
20
20
  = "[#{Settings.namespace}]"
21
21
 
22
+ .navbar-header.pull-right
23
+ .header-indicators
24
+ =# render :dashboard_indicators
25
+ = render :dashboard_status
22
26
 
23
27
  .container-fluid
24
28
 
25
- = render :dashboard_headers
26
-
27
- %br
28
- %br
29
29
  %br
30
30
 
31
- = render :dashboard_jobs
31
+ .row
32
+ #box-jobs.col-md-12
33
+ = render :dashboard_jobs
32
34
 
33
35
  .row
34
36
  #box-tokens.col-md-6
@@ -40,4 +42,20 @@
40
42
  #box-counters.col-md-3
41
43
  = render :dashboard_counters
42
44
 
43
- %br
45
+
46
+ .footer
47
+ .container-fluid
48
+
49
+ .footer-signature.pull-left
50
+
51
+ © 2014
52
+ ·
53
+ %a{href: "http://bmconseil.com"}Bruno Medici Consultant
54
+ ·
55
+ %a{href: "http://github.com/bmedici/rest-ftp-daemon"} GitHub project page
56
+
57
+ .footer-indicators.pull-right
58
+ = render :dashboard_infos
59
+ =# render :dashboard_status
60
+
61
+
data/lib/rest-ftp-daemon/views/dashboard_infos.haml ADDED
@@ -0,0 +1,19 @@
1
+ - trans = $queue.counter_get :transferred
2
+ - info_procs = (Facter.value :processorcount).to_i
3
+
4
+
5
+ .btn-group.btn-group-sm
6
+ .btn.btn-default.btn-info Host
7
+ .btn.btn-default= Settings.host
8
+
9
+ .btn-group.btn-group-sm
10
+ .btn.btn-default.btn-info IP
11
+ .btn.btn-default= Facter.value(:ipaddress)
12
+
13
+ .btn-group.btn-group-sm
14
+ .btn.btn-default.btn-info Cores
15
+ .btn.btn-default= info_procs
16
+
17
+ .btn-group.btn-group-sm
18
+ .btn.btn-default.btn-info Started
19
+ .btn.btn-default= Helpers.datetime_short(APP_STARTED)
data/lib/rest-ftp-daemon/views/dashboard_jobs.haml CHANGED
@@ -2,22 +2,22 @@
2
2
  - counts_all = $queue.jobs_count
3
3
  - jobs = @paginate.subset
4
4
 
5
-
6
5
  .row
7
6
 
8
7
  .col-md-5
9
- .btn-group.btn-group-md
8
+ .btn-group.btn-group-sm
10
9
  - klass = @only.empty? ? "btn-info" : ""
11
10
  %a.btn.btn-default{href: "?only=", class: klass}
12
11
  ALL (#{counts_all})
13
- .btn-group.btn-group-md
12
+ .btn-group.btn-group-sm
14
13
  - counts_by_status.each do |status, count|
15
14
  - klass = (status.to_s == @only) ? "btn-info" : ""
16
15
  %a.btn.btn-default{href: "?only=#{status}", class: klass}
17
16
  #{status} (#{count})
18
17
 
19
18
  .col-md-7
20
- = @paginate.browser
19
+ .btn-group.btn-group-sm
20
+ = @paginate.browser
21
21
 
22
22
 
23
23
 
data/lib/rest-ftp-daemon/views/{dashboard_headers.haml → dashboard_status.haml} RENAMED
@@ -6,18 +6,6 @@
6
6
  - mem = GetProcessMem.new
7
7
 
8
8
 
9
- .btn-group.btn-group-sm
10
- .btn.btn-default.btn-success Host
11
- .btn.btn-default= Settings.host
12
-
13
- .btn-group.btn-group-sm
14
- .btn.btn-default.btn-success IP
15
- .btn.btn-default= Facter.value(:ipaddress)
16
-
17
- .btn-group.btn-group-sm
18
- .btn.btn-default.btn-success Cores
19
- .btn.btn-default= info_procs
20
-
21
9
  .btn-group.btn-group-sm
22
10
  .btn.btn-default.btn-warning Load
23
11
  .btn.btn-default= info_load.round(1)
@@ -31,11 +19,11 @@
31
19
  .btn.btn-default= Helpers.format_bytes(mem.bytes, "B")
32
20
 
33
21
  .btn-group.btn-group-sm
34
- .btn.btn-default.btn-info Processed
35
- .btn.btn-default= info_processed
22
+ .btn.btn-default.btn-success Processed
23
+ .btn.btn-default= info_processed.to_i
36
24
 
37
25
  .btn-group.btn-group-sm
38
- .btn.btn-default.btn-info Transferred
26
+ .btn.btn-default.btn-success Transferred
39
27
  .btn.btn-default= Helpers.format_bytes(trans, "B")
40
28
 
41
29
 
data/lib/rest-ftp-daemon/views/dashboard_table.haml CHANGED
@@ -50,7 +50,6 @@
50
50
  - unless job.error || job.status == JOB_STATUS_FINISHED
51
51
  .progress
52
52
  .progress-bar{style:"width: #{progress}%;"}
53
- =# "#{progress}%" unless progress.nil?
54
53
  = Helpers.format_bytes(job.get(:transfer_sent), "B")
55
54
 
56
55
  - else
data/lib/rest-ftp-daemon/worker_job.rb CHANGED
@@ -44,6 +44,9 @@ module RestFtpDaemon
44
44
  rescue RestFtpDaemon::JobTimeout => ex
45
45
  log_error "JOB TIMED OUT", lines: ex.backtrace
46
46
  worker_status :timeout
47
+ worker_jid nil
48
+ job.wid = nil
49
+
47
50
  job.oops_you_stop_now ex unless job.nil?
48
51
  sleep 1
49
52
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rest-ftp-daemon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.220.4
4
+ version: '0.221'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bruno MEDICI
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-05 00:00:00.000000000 Z
11
+ date: 2015-05-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -246,8 +246,9 @@ files:
246
246
  - lib/rest-ftp-daemon/uri.rb
247
247
  - lib/rest-ftp-daemon/views/dashboard.haml
248
248
  - lib/rest-ftp-daemon/views/dashboard_counters.haml
249
- - lib/rest-ftp-daemon/views/dashboard_headers.haml
249
+ - lib/rest-ftp-daemon/views/dashboard_infos.haml
250
250
  - lib/rest-ftp-daemon/views/dashboard_jobs.haml
251
+ - lib/rest-ftp-daemon/views/dashboard_status.haml
251
252
  - lib/rest-ftp-daemon/views/dashboard_table.haml
252
253
  - lib/rest-ftp-daemon/views/dashboard_tokens.haml
253
254
  - lib/rest-ftp-daemon/views/dashboard_workers.haml