|
|
|
@ -389,23 +389,22 @@ func (ss *Sqlite) GetLog(in GetLogInput) (GetLogResult, error) {
|
|
|
|
|
|
|
|
|
|
sql := `
|
|
|
|
|
SELECT
|
|
|
|
|
started, clientIp, protocol, domain, totalTimeMs,
|
|
|
|
|
error, recurseRoundTripTimeMs, recurseUpstreamIp, status
|
|
|
|
|
started, clientIp, protocol, domain, totalTimeMs,
|
|
|
|
|
error, recurseRoundTripTimeMs, recurseUpstreamIp, status
|
|
|
|
|
FROM (
|
|
|
|
|
SELECT id,
|
|
|
|
|
started,
|
|
|
|
|
clientIp,
|
|
|
|
|
protocol,
|
|
|
|
|
domain,
|
|
|
|
|
totalTimeMs,
|
|
|
|
|
error,
|
|
|
|
|
recurseRoundTripTimeMs,
|
|
|
|
|
recurseUpstreamIp,
|
|
|
|
|
status
|
|
|
|
|
FROM log
|
|
|
|
|
WHERE strftime('%s', started) >= strftime('%s', ?)
|
|
|
|
|
AND strftime('%s', started) <= strftime('%s', ?)
|
|
|
|
|
ORDER BY started DESC
|
|
|
|
|
SELECT id,
|
|
|
|
|
started,
|
|
|
|
|
clientIp,
|
|
|
|
|
protocol,
|
|
|
|
|
domain,
|
|
|
|
|
totalTimeMs,
|
|
|
|
|
error,
|
|
|
|
|
recurseRoundTripTimeMs,
|
|
|
|
|
recurseUpstreamIp,
|
|
|
|
|
status
|
|
|
|
|
FROM log
|
|
|
|
|
WHERE CAST(strftime('%s', started) AS INTEGER) BETWEEN ? AND ?
|
|
|
|
|
ORDER BY started DESC
|
|
|
|
|
) WHERE id <= ? ORDER BY id DESC LIMIT ?;
|
|
|
|
|
`
|
|
|
|
|
|
|
|
|
@ -458,12 +457,11 @@ func (ss *Sqlite) GetPagingInfo(in GetLogInput) (lpi LogPageInfo, err error) {
|
|
|
|
|
SELECT
|
|
|
|
|
COUNT(*) as totalLogsEntries,
|
|
|
|
|
COUNT(*) / ? as pageCount,
|
|
|
|
|
MAX(id) - ? as firstItemId
|
|
|
|
|
IFNULL(MAX(id) - ?, 0) as firstItemId
|
|
|
|
|
FROM
|
|
|
|
|
log
|
|
|
|
|
WHERE
|
|
|
|
|
strftime('%s', started) > strftime('%s', ?)
|
|
|
|
|
AND strftime('%s', started) < strftime('%s', ?)
|
|
|
|
|
CAST(strftime('%s', started) AS INTEGER) BETWEEN ? AND ?
|
|
|
|
|
ORDER BY id DESC
|
|
|
|
|
`
|
|
|
|
|
|
|
|
|
|