Skip to content

Commit 5182786

Browse files
committed
add logging on unexpected status codes
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
1 parent 6562481 commit 5182786

File tree

2 files changed

+36
-8
lines changed
  • internal/http/services/owncloud/ocs/handlers/apps/sharing/shares

2 files changed

+36
-8
lines changed

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,16 @@ func (h *Handler) isPublicShare(r *http.Request, oid string) (*link.PublicShare,
295295
},
296296
},
297297
})
298-
if err != nil {
299-
logger.Err(err)
298+
switch {
299+
case err != nil:
300+
log.Err(err).Send()
300301
return nil, false
302+
case psRes.Status.Code == rpc.Code_CODE_OK:
303+
fallthrough
304+
case psRes.Status.Code == rpc.Code_CODE_NOT_FOUND:
305+
log.Debug().Str("message", psRes.GetStatus().GetMessage()).Str("code", psRes.GetStatus().GetCode().String()).Msg("isPublicShare received unexpected status")
306+
case psRes.Status.Code == rpc.Code_CODE_INTERNAL:
307+
log.Error().Str("message", psRes.GetStatus().GetMessage()).Str("code", psRes.GetStatus().GetCode().String()).Msg("isPublicShare received unexpected status")
301308
}
302309

303310
return psRes.GetShare(), psRes.GetShare() != nil

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/user.go

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ func (h *Handler) createUserShare(w http.ResponseWriter, r *http.Request, statIn
132132
}
133133

134134
func (h *Handler) isUserShare(r *http.Request, oid string) (*collaboration.Share, bool) {
135-
logger := appctx.GetLogger(r.Context())
135+
log := appctx.GetLogger(r.Context())
136136
client, err := pool.GetGatewayServiceClient(h.gatewayAddr)
137137
if err != nil {
138-
logger.Err(err)
138+
log.Err(err).Send()
139139
}
140140

141141
getShareRes, err := client.GetShare(r.Context(), &collaboration.GetShareRequest{
@@ -147,9 +147,16 @@ func (h *Handler) isUserShare(r *http.Request, oid string) (*collaboration.Share
147147
},
148148
},
149149
})
150-
if err != nil {
151-
logger.Err(err)
150+
switch {
151+
case err != nil:
152+
log.Err(err).Send()
152153
return nil, false
154+
case getShareRes.Status.Code == rpc.Code_CODE_OK:
155+
fallthrough
156+
case getShareRes.Status.Code == rpc.Code_CODE_NOT_FOUND:
157+
log.Debug().Str("message", getShareRes.GetStatus().GetMessage()).Str("code", getShareRes.GetStatus().GetCode().String()).Msg("isUserShare received unexpected status")
158+
case getShareRes.Status.Code == rpc.Code_CODE_INTERNAL:
159+
log.Error().Str("message", getShareRes.GetStatus().GetMessage()).Str("code", getShareRes.GetStatus().GetCode().String()).Msg("isUserShare received unexpected status")
153160
}
154161

155162
return getShareRes.GetShare(), getShareRes.GetShare() != nil
@@ -172,9 +179,16 @@ func (h *Handler) isFederatedShare(r *http.Request, shareID string) bool {
172179
},
173180
},
174181
})
175-
if err != nil {
182+
switch {
183+
case err != nil:
176184
log.Err(err).Send()
177185
return false
186+
case getShareRes.Status.Code == rpc.Code_CODE_OK:
187+
fallthrough
188+
case getShareRes.Status.Code == rpc.Code_CODE_NOT_FOUND:
189+
log.Debug().Str("message", getShareRes.GetStatus().GetMessage()).Str("code", getShareRes.GetStatus().GetCode().String()).Msg("isFederatedShare received unexpected status")
190+
case getShareRes.Status.Code == rpc.Code_CODE_INTERNAL:
191+
log.Error().Str("message", getShareRes.GetStatus().GetMessage()).Str("code", getShareRes.GetStatus().GetCode().String()).Msg("isFederatedShare received unexpected status")
178192
}
179193

180194
return getShareRes.GetShare() != nil
@@ -247,9 +261,16 @@ func (h *Handler) isFederatedReceivedShare(r *http.Request, shareID string) bool
247261
},
248262
},
249263
})
250-
if err != nil {
264+
switch {
265+
case err != nil:
251266
log.Err(err).Send()
252267
return false
268+
case getShareRes.Status.Code == rpc.Code_CODE_OK:
269+
fallthrough
270+
case getShareRes.Status.Code == rpc.Code_CODE_NOT_FOUND:
271+
log.Debug().Str("message", getShareRes.GetStatus().GetMessage()).Str("code", getShareRes.GetStatus().GetCode().String()).Msg("isFederatedReceivedShare received unexpected status")
272+
case getShareRes.Status.Code == rpc.Code_CODE_INTERNAL:
273+
log.Error().Str("message", getShareRes.GetStatus().GetMessage()).Str("code", getShareRes.GetStatus().GetCode().String()).Msg("isFederatedReceivedShare received unexpected status")
253274
}
254275

255276
return getShareRes.GetShare() != nil

0 commit comments

Comments
 (0)