@@ -132,10 +132,10 @@ func (h *Handler) createUserShare(w http.ResponseWriter, r *http.Request, statIn
132
132
}
133
133
134
134
func (h * Handler ) isUserShare (r * http.Request , oid string ) (* collaboration.Share , bool ) {
135
- logger := appctx .GetLogger (r .Context ())
135
+ log := appctx .GetLogger (r .Context ())
136
136
client , err := pool .GetGatewayServiceClient (h .gatewayAddr )
137
137
if err != nil {
138
- logger .Err (err )
138
+ log .Err (err ). Send ( )
139
139
}
140
140
141
141
getShareRes , err := client .GetShare (r .Context (), & collaboration.GetShareRequest {
@@ -147,9 +147,16 @@ func (h *Handler) isUserShare(r *http.Request, oid string) (*collaboration.Share
147
147
},
148
148
},
149
149
})
150
- if err != nil {
151
- logger .Err (err )
150
+ switch {
151
+ case err != nil :
152
+ log .Err (err ).Send ()
152
153
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" )
153
160
}
154
161
155
162
return getShareRes .GetShare (), getShareRes .GetShare () != nil
@@ -172,9 +179,16 @@ func (h *Handler) isFederatedShare(r *http.Request, shareID string) bool {
172
179
},
173
180
},
174
181
})
175
- if err != nil {
182
+ switch {
183
+ case err != nil :
176
184
log .Err (err ).Send ()
177
185
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" )
178
192
}
179
193
180
194
return getShareRes .GetShare () != nil
@@ -247,9 +261,16 @@ func (h *Handler) isFederatedReceivedShare(r *http.Request, shareID string) bool
247
261
},
248
262
},
249
263
})
250
- if err != nil {
264
+ switch {
265
+ case err != nil :
251
266
log .Err (err ).Send ()
252
267
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" )
253
274
}
254
275
255
276
return getShareRes .GetShare () != nil
0 commit comments