Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
miniflux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
miniflux
Commits
a1028437
Commit
a1028437
authored
4 years ago
by
Frédéric Guillot
Browse files
Options
Downloads
Patches
Plain Diff
Improve Fever API logging
parent
bf443a65
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
fever/handler.go
+10
-6
10 additions, 6 deletions
fever/handler.go
fever/middleware.go
+1
-1
1 addition, 1 deletion
fever/middleware.go
with
11 additions
and
7 deletions
fever/handler.go
+
10
−
6
View file @
a1028437
...
...
@@ -80,7 +80,7 @@ is_spark equal to 1.
*/
func
(
h
*
handler
)
handleGroups
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
userID
:=
request
.
UserID
(
r
)
logger
.
Debug
(
"[Fever] Fetching groups for user
ID=
%d"
,
userID
)
logger
.
Debug
(
"[Fever] Fetching groups for user
#
%d"
,
userID
)
categories
,
err
:=
h
.
store
.
Categories
(
userID
)
if
err
!=
nil
{
...
...
@@ -183,7 +183,7 @@ A PHP/HTML example:
*/
func
(
h
*
handler
)
handleFavicons
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
userID
:=
request
.
UserID
(
r
)
logger
.
Debug
(
"[Fever] Fetching favicons for user
ID=
%d"
,
userID
)
logger
.
Debug
(
"[Fever] Fetching favicons for user
#
%d"
,
userID
)
icons
,
err
:=
h
.
store
.
Icons
(
userID
)
if
err
!=
nil
{
...
...
@@ -238,7 +238,6 @@ func (h *handler) handleItems(w http.ResponseWriter, r *http.Request) {
var
result
itemsResponse
userID
:=
request
.
UserID
(
r
)
logger
.
Debug
(
"[Fever] Fetching items for userID=%d"
,
userID
)
builder
:=
h
.
store
.
NewEntryQueryBuilder
(
userID
)
builder
.
WithoutStatus
(
model
.
EntryStatusRemoved
)
...
...
@@ -250,13 +249,16 @@ func (h *handler) handleItems(w http.ResponseWriter, r *http.Request) {
case
request
.
HasQueryParam
(
r
,
"since_id"
)
:
sinceID
:=
request
.
QueryInt64Param
(
r
,
"since_id"
,
0
)
if
sinceID
>
0
{
logger
.
Debug
(
"[Fever] Fetching items since #%d for user #%d"
,
sinceID
,
userID
)
builder
.
AfterEntryID
(
sinceID
)
}
case
request
.
HasQueryParam
(
r
,
"max_id"
)
:
maxID
:=
request
.
QueryInt64Param
(
r
,
"max_id"
,
0
)
if
maxID
==
0
{
logger
.
Debug
(
"[Fever] Fetching most recent items for user #%d"
,
userID
)
builder
.
WithDirection
(
"desc"
)
}
else
if
maxID
>
0
{
logger
.
Debug
(
"[Fever] Fetching items before #%d for user #%d"
,
maxID
,
userID
)
builder
.
BeforeEntryID
(
maxID
)
builder
.
WithDirection
(
"desc"
)
}
...
...
@@ -273,6 +275,8 @@ func (h *handler) handleItems(w http.ResponseWriter, r *http.Request) {
builder
.
WithEntryIDs
(
itemIDs
)
}
default
:
logger
.
Debug
(
"[Fever] Fetching oldest items for user #%d"
,
userID
)
}
entries
,
err
:=
builder
.
GetEntries
()
...
...
@@ -327,7 +331,7 @@ A request with the unread_item_ids argument will return one additional member:
*/
func
(
h
*
handler
)
handleUnreadItems
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
userID
:=
request
.
UserID
(
r
)
logger
.
Debug
(
"[Fever] Fetching unread items for user
ID=
%d"
,
userID
)
logger
.
Debug
(
"[Fever] Fetching unread items for user
#
%d"
,
userID
)
builder
:=
h
.
store
.
NewEntryQueryBuilder
(
userID
)
builder
.
WithStatus
(
model
.
EntryStatusUnread
)
...
...
@@ -358,7 +362,7 @@ with the remote Fever installation.
*/
func
(
h
*
handler
)
handleSavedItems
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
userID
:=
request
.
UserID
(
r
)
logger
.
Debug
(
"[Fever] Fetching saved items for user
ID=
%d"
,
userID
)
logger
.
Debug
(
"[Fever] Fetching saved items for user
#
%d"
,
userID
)
builder
:=
h
.
store
.
NewEntryQueryBuilder
(
userID
)
builder
.
WithStarred
()
...
...
@@ -386,7 +390,7 @@ func (h *handler) handleSavedItems(w http.ResponseWriter, r *http.Request) {
*/
func
(
h
*
handler
)
handleWriteItems
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
userID
:=
request
.
UserID
(
r
)
logger
.
Debug
(
"[Fever] Receiving mark=item call for user
ID=
%d"
,
userID
)
logger
.
Debug
(
"[Fever] Receiving mark=item call for user
#
%d"
,
userID
)
entryID
:=
request
.
FormInt64Value
(
r
,
"id"
)
if
entryID
<=
0
{
...
...
This diff is collapsed.
Click to expand it.
fever/middleware.go
+
1
−
1
View file @
a1028437
...
...
@@ -44,7 +44,7 @@ func (m *middleware) serve(next http.Handler) http.Handler {
return
}
logger
.
Info
(
"[Fever] User #%d is authenticated
"
,
user
.
ID
)
logger
.
Info
(
"[Fever] User #%d is authenticated
with user agent %q"
,
user
.
ID
,
r
.
UserAgent
()
)
m
.
store
.
SetLastLogin
(
user
.
ID
)
ctx
:=
r
.
Context
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment