cn/openvpn-status-web
1
0
Fork 0
mirror of https://github.com/cmur2/openvpn-status-web.git synced 2025-06-29 10:30:23 +02:00
Code Releases Activity

Add support for multiple status-versions

Browse Source
This commit is contained in:
cn
2013-05-03 20:09:46 +02:00
parent ed42fc9f30
commit 33013c56f3
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/openvpn-status-web.rb
View File

@ -11,6 +11,7 @@ require 'better_errors'
require 'openvpn-status-web/status'
require 'openvpn-status-web/parser/v1'
require 'openvpn-status-web/parser/v2'
require 'openvpn-status-web/int_patch'
require 'openvpn-status-web/version'
@ -42,10 +43,9 @@ module OpenVPNStatusWeb
# variables for template
name = @vpns.keys.first
status = read_status_log(@vpns[name]['status_file'])
status = parse_status_log(@vpns[name])
# eval
html = @main_tmpl.result(binding)
#html = ""
[200, {"Content-Type" => "text/html"}, [html]]
end
@ -56,10 +56,17 @@ module OpenVPNStatusWeb
ERB.new(text)
end
def read_status_log(file)
text = File.open(file, 'rb') do |f| f.read end
def parse_status_log(vpn)
text = File.open(vpn['status_file'], 'rb') do |f| f.read end
OpenVPNStatusWeb::Parser::V1.new.parse_status_log(text)
case vpn['version']
when 1
OpenVPNStatusWeb::Parser::V1.new.parse_status_log(text)
when 2
OpenVPNStatusWeb::Parser::V2.new.parse_status_log(text)
else
raise "No suitable parser for status-version #{vpn['version']}"
end
end
def self.run!