forked from forgejo/forgejo
Fix recovery middleware to render gitea style page. (#13857)
* Some changes to fix recovery * Move Recovery to middlewares * Remove trace code * Fix lint * add session middleware and remove dependent on macaron for sso * Fix panic 500 page rendering * Fix bugs * Fix fmt * Fix vendor * recover unnecessary change * Fix lint and addd some comments about the copied codes. * Use util.StatDir instead of com.StatDir Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
126c9331d6
commit
15a475b7db
75 changed files with 5233 additions and 307 deletions
22
vendor/github.com/couchbase/gomemcached/client/upr_feed.go
generated
vendored
22
vendor/github.com/couchbase/gomemcached/client/upr_feed.go
generated
vendored
|
@ -26,6 +26,7 @@ const opaqueOpen = 0xBEAF0001
|
|||
const opaqueFailover = 0xDEADBEEF
|
||||
const opaqueGetSeqno = 0xDEADBEEF
|
||||
const uprDefaultNoopInterval = 120
|
||||
const dcpOsoExtraLen = 4
|
||||
|
||||
// Counter on top of opaqueOpen that others can draw from for open and control msgs
|
||||
var opaqueOpenCtrlWell uint32 = opaqueOpen
|
||||
|
@ -117,6 +118,7 @@ type UprFeatures struct {
|
|||
DcpPriority PriorityType
|
||||
EnableExpiry bool
|
||||
EnableStreamId bool
|
||||
EnableOso bool
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -601,6 +603,20 @@ func (feed *UprFeed) uprOpen(name string, sequence uint32, bufSize uint32, featu
|
|||
activatedFeatures.EnableStreamId = true
|
||||
}
|
||||
|
||||
if features.EnableOso {
|
||||
rq := &gomemcached.MCRequest{
|
||||
Opcode: gomemcached.UPR_CONTROL,
|
||||
Key: []byte("enable_out_of_order_snapshots"),
|
||||
Body: []byte("true"),
|
||||
Opaque: getUprOpenCtrlOpaque(),
|
||||
}
|
||||
err = sendMcRequestSync(feed.conn, rq)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
activatedFeatures.EnableOso = true
|
||||
}
|
||||
|
||||
// everything is ok so far, set upr feed to open state
|
||||
feed.activatedFeatures = activatedFeatures
|
||||
feed.setOpen()
|
||||
|
@ -976,6 +992,12 @@ loop:
|
|||
break loop
|
||||
}
|
||||
event = makeUprEvent(pkt, stream, bytes)
|
||||
case gomemcached.DCP_OSO_SNAPSHOT:
|
||||
if stream == nil {
|
||||
logging.Infof("Stream not found for vb %d: %#v", vb, pkt)
|
||||
break loop
|
||||
}
|
||||
event = makeUprEvent(pkt, stream, bytes)
|
||||
default:
|
||||
logging.Infof("Recived an unknown response for vbucket %d", vb)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue