sms-logparser 0.4.1 → 0.4.2
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/lib/sms-logparser/cli.rb +6 -3
- data/lib/sms-logparser/mysql.rb +6 -5
- data/lib/sms-logparser/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 70fe26fc8e08cb3a96d4e544d42e9b4a4339f365
|
|
4
|
+
data.tar.gz: a83efcde36afbc9d1585ddfe9a178007d2e722f0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b62ee3100a80606ece11fd428a5af48fbce66da23c45393db54686526b263966a866d1a7bced578f0e467b0313732550f82ebbc100fb0f4539f89b758349626e
|
|
7
|
+
data.tar.gz: 71b40a3a41672b9fc165546de30ca9754a1e8df05c088794d5194fe7af2c233b7bd674c7eb48cb66634c1d4b397b1f60c3652b17190521c8be5c3cb7f7552816
|
data/lib/sms-logparser/cli.rb
CHANGED
|
@@ -28,7 +28,7 @@ module SmsLogparser
|
|
|
28
28
|
aliases: %w(-d),
|
|
29
29
|
desc: "MySQL database (default: Syslog)"
|
|
30
30
|
|
|
31
|
-
desc "version", "Print
|
|
31
|
+
desc "version", "Print sms-logparser version number"
|
|
32
32
|
def version
|
|
33
33
|
say "sms-logparser v#{SmsLogparser::VERSION}"
|
|
34
34
|
end
|
|
@@ -48,12 +48,15 @@ module SmsLogparser
|
|
|
48
48
|
type: :boolean,
|
|
49
49
|
default: false,
|
|
50
50
|
aliases: %w(-v)
|
|
51
|
+
option :limit,
|
|
52
|
+
type: :numeric,
|
|
53
|
+
aliases: %w(-l)
|
|
51
54
|
def parse
|
|
52
55
|
start_time = Time.now
|
|
53
56
|
count = 0
|
|
54
57
|
begin
|
|
55
58
|
mysql = Mysql.new(options)
|
|
56
|
-
entries = mysql.get_entries
|
|
59
|
+
entries = mysql.get_entries(limit: options[:limit])
|
|
57
60
|
api = Api.new(options)
|
|
58
61
|
last_id = mysql.get_last_parse_id
|
|
59
62
|
status = STATUS[:ok]
|
|
@@ -109,7 +112,7 @@ module SmsLogparser
|
|
|
109
112
|
run['RunAt'],
|
|
110
113
|
run['EventsFound'],
|
|
111
114
|
run['LastEventID'],
|
|
112
|
-
STATUS.
|
|
115
|
+
STATUS.key(run['Status']).upcase
|
|
113
116
|
]
|
|
114
117
|
end
|
|
115
118
|
print_table table
|
data/lib/sms-logparser/mysql.rb
CHANGED
|
@@ -68,13 +68,14 @@ module SmsLogparser
|
|
|
68
68
|
end
|
|
69
69
|
end
|
|
70
70
|
|
|
71
|
-
def get_entries(
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
71
|
+
def get_entries(options={})
|
|
72
|
+
last_id = options[:last_id] || get_last_parse_id
|
|
73
|
+
begin
|
|
74
|
+
sql = "SELECT * FROM SystemEvents\
|
|
75
75
|
WHERE `FromHost` like 'pcache%'\
|
|
76
76
|
AND ID > #{last_id} ORDER BY ID ASC"
|
|
77
|
-
|
|
77
|
+
sql += " LIMIT #{options[:limit].to_i}" if options[:limit]
|
|
78
|
+
return client.query(sql)
|
|
78
79
|
rescue Mysql2::Error => e
|
|
79
80
|
raise e
|
|
80
81
|
end
|