diff --git a/braga/db/logs.lua b/braga/db/logs.lua deleted file mode 100644 index 2e99144..0000000 --- a/braga/db/logs.lua +++ /dev/null @@ -1,67 +0,0 @@ -local _M = {} -local db = require('db.mysql') -_M['date'] = os.date('%Y-%m-%d %H:%M:%S') - -function _M.get(limit,offset) - local cur - if limit == nil then - cur = db.cursor("SELECT * FROM logs ORDER BY started DESC") - else - if offset == nil then offset = 0 end - cur = db.cursor("SELECT * FROM logs ORDER BY started DESC LIMIT "..limit.." OFFSET "..offset) - end - return db.results(cur) -end - -function _M.period(start,ends,user) - local cur - if user == nil then - cur = db.cursor("SELECT user,url,client_ip,host_ip,DATE_ADD(logs.started, INTERVAL 4 HOUR) as day, ROUND(bytesin/1000,2) as bin, ROUND(bytesout/1000,2) as bout FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."' ORDER BY started DESC") - else - cur = db.cursor("SELECT user,url,client_ip,host_ip,DATE_ADD(logs.started, INTERVAL 4 HOUR) as day, ROUND(bytesin/1000,2) as bin, ROUND(bytesout/1000,2) as bout FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."' ORDER BY started DESC") - end - return db.results(cur) -end - -function _M.connects(start,ends,user) - local cur - if user == nil then - cur = db.cursor("SELECT user, ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, COUNT(*) as connects FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."' GROUP BY user ORDER BY connects DESC") - else - cur = db.cursor("SELECT user, ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, COUNT(*) as connects FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."' GROUP BY user ORDER BY connects DESC") - end - return db.results(cur) -end - -function _M.traffic(start,ends,user) - local cur - local results = {} - if user == nil then - cur = db.cursor("SELECT ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."'") - else - cur = db.cursor("SELECT ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."'") - end - results = db.results(cur) - if results[1] then results = results[1] end - return results -end - -function _M.daystats(start,ends,user) - local cur - local results = {} - if user == nil then - cur = db.cursor("SELECT DATE_FORMAT(started,'%d.%m') as day, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."' GROUP BY day ORDER BY day ASC") - else - cur = db.cursor("SELECT DATE_FORMAT(started,'%d.%m') as day, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM logs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."' GROUP BY day ORDER BY day ASC") - end - return db.results(cur) -end - -function _M.users() - local cur - local results = {} - cur = db.cursor("SELECT user FROM logs WHERE bytesin>0 GROUP BY user ORDER BY user DESC") - return db.results(cur) -end - -return _M diff --git a/braga/db/mysql.lua b/braga/db/mysql.lua deleted file mode 100644 index 1ce273b..0000000 --- a/braga/db/mysql.lua +++ /dev/null @@ -1,34 +0,0 @@ -local _M = {} -local luasql = require "luasql.mysql" -local json = require "cjson"; -_M['date'] = os.date('%Y-%m-%d %H:%M:%S') -local db = "log" -local db_user = "3proxy" -local db_password = "645zzz" -local env = assert(luasql.mysql()) -local con = assert(env:connect(db,db_user,db_password)) - -function _M.cursor(data) - return assert(con:execute(data)) -end - -function _M.results(cur) - local results = {} - if not cur then return results end - local i = 1 - row = cur:fetch({},"a") - while row do - results[i] = {} - for key,val in pairs(row) do - results[i][key] = val - end - row = cur:fetch (row, "a") - i = i + 1 - end - cur:close() - --con:close() - --env:close() - return results -end - -return _M diff --git a/braga/db/vpnlogs.lua b/braga/db/vpnlogs.lua deleted file mode 100644 index 1e4fd5d..0000000 --- a/braga/db/vpnlogs.lua +++ /dev/null @@ -1,67 +0,0 @@ -local _M = {} -local db = require('db.mysql') -_M['date'] = os.date('%Y-%m-%d %H:%M:%S') - -function _M.get(limit,offset) - local cur - if limit == nil then - cur = db.cursor("SELECT * FROM vpnlogs ORDER BY started DESC") - else - if offset == nil then offset = 0 end - cur = db.cursor("SELECT * FROM vpnlogs ORDER BY started DESC LIMIT "..limit.." OFFSET "..offset) - end - return db.results(cur) -end - -function _M.period(start,ends,user) - local cur - if user == nil then - cur = db.cursor("SELECT user,client_ip,DATE_ADD(logs.started, INTERVAL 4 HOUR) as day, ROUND(bytesin/1000,2) as bin, ROUND(bytesout/1000,2) as bout FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."' ORDER BY started DESC") - else - cur = db.cursor("SELECT user,client_ip,DATE_ADD(logs.started, INTERVAL 4 HOUR) as day, ROUND(bytesin/1000,2) as bin, ROUND(bytesout/1000,2) as bout FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."' ORDER BY started DESC") - end - return db.results(cur) -end - -function _M.connects(start,ends,user) - local cur - if user == nil then - cur = db.cursor("SELECT user, ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, COUNT(*) as connects FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."' GROUP BY user ORDER BY connects DESC") - else - cur = db.cursor("SELECT user, ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, COUNT(*) as connects FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."' GROUP BY user ORDER BY connects DESC") - end - return db.results(cur) -end - -function _M.traffic(start,ends,user) - local cur - local results = {} - if user == nil then - cur = db.cursor("SELECT ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."'") - else - cur = db.cursor("SELECT ROUND(SUM(bytesin)/1000000) as bin, ROUND(SUM(bytesout)/1000000) as bout, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."'") - end - results = db.results(cur) - if results[1] then results = results[1] end - return results -end - -function _M.daystats(start,ends,user) - local cur - local results = {} - if user == nil then - cur = db.cursor("SELECT DATE_FORMAT(started,'%d.%m') as day, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."' GROUP BY day ORDER BY day ASC") - else - cur = db.cursor("SELECT DATE_FORMAT(started,'%d.%m') as day, ROUND(SUM(bytesin)/1000000) + ROUND(SUM(bytesout)/1000000) as summ FROM vpnlogs WHERE started BETWEEN '"..start.."' AND '"..ends.."' AND user = '"..user.."' GROUP BY day ORDER BY day ASC") - end - return db.results(cur) -end - -function _M.users() - local cur - local results = {} - cur = db.cursor("SELECT user FROM vpnlogs WHERE bytesin>0 GROUP BY user ORDER BY user DESC") - return db.results(cur) -end - -return _M diff --git a/pub?gid=0 b/pub?gid=0 deleted file mode 100644 index dd9ad51..0000000 --- a/pub?gid=0 +++ /dev/null @@ -1,73 +0,0 @@ -