chaltron 1.0.2 → 1.0.3
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.
- checksums.yaml +4 -4
- data/app/helpers/chaltron/logs_helper.rb +8 -4
- data/app/models/log.rb +11 -9
- data/app/views/chaltron/users/self_edit.html.erb +1 -1
- data/lib/chaltron/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c137626426ad577a84df81068a09611fbcc40cd0
|
4
|
+
data.tar.gz: 9e3800ab7f2610b444bb8ad9f8e9c20e8a655542
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7d8213a9292b9463a63f139935ea62f677248e9a07a3da953222d0c3ed67a6bf3a4559f20e31bbac09ca275dea9ef339ec56a77b59a827787581282a7394210c
|
7
|
+
data.tar.gz: b34b3ff7e0bc27b1451b61991cacf23cd87f55360cf998393dbec091fc7e84cb5970d558520ece8f52ae29df53e16bb46a70897f2137b6f45fc5e7153edbaeca
|
@@ -1,10 +1,14 @@
|
|
1
1
|
module Chaltron::LogsHelper
|
2
2
|
def bootstrap_severity(severity)
|
3
3
|
case severity.to_s
|
4
|
-
when '
|
5
|
-
|
6
|
-
when '
|
7
|
-
|
4
|
+
when 'emerg', 'alert', 'crit', 'err'
|
5
|
+
'danger'
|
6
|
+
when 'warning', 'notice'
|
7
|
+
'warning'
|
8
|
+
when 'debug'
|
9
|
+
'info'
|
10
|
+
else
|
11
|
+
'primary'
|
8
12
|
end
|
9
13
|
end
|
10
14
|
end
|
data/app/models/log.rb
CHANGED
@@ -1,22 +1,24 @@
|
|
1
1
|
class Log < ActiveRecord::Base
|
2
|
-
Severities = %w( info debug
|
2
|
+
Severities = %w( emerg alert crit err warning notice info debug )
|
3
3
|
|
4
4
|
validates_presence_of :severity, :message
|
5
5
|
validates_inclusion_of :severity, in: Severities
|
6
6
|
|
7
|
+
before_validation :change_severity
|
8
|
+
|
7
9
|
after_create :to_syslog if Chaltron.enable_syslog
|
8
10
|
|
9
11
|
private
|
12
|
+
|
13
|
+
def change_severity
|
14
|
+
self.severity = :emerg if self.severity && self.severity.to_sym == :panic
|
15
|
+
self.severity = :err if self.severity && self.severity.to_sym == :error
|
16
|
+
self.severity = :warning if self.severity && self.severity.to_sym == :warn
|
17
|
+
end
|
18
|
+
|
10
19
|
def to_syslog
|
11
|
-
syslog_method =
|
12
|
-
case self.severity
|
13
|
-
when 'info' then :notice
|
14
|
-
when 'debug' then :debug
|
15
|
-
when 'error' then :err
|
16
|
-
else :info
|
17
|
-
end
|
18
20
|
Syslog.open(Rails.application.class.parent.to_s, Syslog::LOG_PID, Chaltron.syslog_facility) do |s|
|
19
|
-
s.send(
|
21
|
+
s.send(self.severity.to_sym, self.category.upcase + ' - ' + self.message)
|
20
22
|
end
|
21
23
|
end
|
22
24
|
|
@@ -20,7 +20,7 @@
|
|
20
20
|
<div class='col-sm-10'>
|
21
21
|
<%= f.submit t('.submit'), class: 'btn btn-primary' %>
|
22
22
|
<%= link_to self_show_users_path, class: 'btn btn-link pull-right' do %>
|
23
|
-
<%= icon :
|
23
|
+
<%= icon :fas, :times, t('chaltron.common.cancel') %>
|
24
24
|
<% end %>
|
25
25
|
</div>
|
26
26
|
</div>
|
data/lib/chaltron/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chaltron
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- vicvega
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-03-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|