mirror of
https://github.com/gravitational/teleport.git
synced 2026-09-24 16:17:11 +08:00
remove rejected files from bad patch apply (#66190)
This commit is contained in:
@@ -1,24 +0,0 @@
|
||||
diff a/lib/events/stream.go b/lib/events/stream.go (rejected hunks)
|
||||
@@ -166,16 +170,18 @@ func NewProtoStreamer(cfg ProtoStreamerConfig) (*ProtoStreamer, error) {
|
||||
// Min upload bytes + some overhead to prevent buffer growth (gzip writer is not precise)
|
||||
bufferPool: utils.NewBufferSyncPool(cfg.MinUploadBytes + cfg.MinUploadBytes/3),
|
||||
// MaxProtoMessage size + length of the message record
|
||||
- slicePool: utils.NewSliceSyncPool(MaxProtoMessageSizeBytes + ProtoStreamV1RecordHeaderSize),
|
||||
+ slicePool: utils.NewSliceSyncPool(MaxProtoMessageSizeBytes + ProtoStreamV1RecordHeaderSize),
|
||||
+ onUploadComplete: cfg.OnUploadComplete,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// ProtoStreamer creates protobuf-based streams uploaded to the storage
|
||||
// backends, for example S3 or GCS
|
||||
type ProtoStreamer struct {
|
||||
- cfg ProtoStreamerConfig
|
||||
- bufferPool *utils.BufferSyncPool
|
||||
- slicePool *utils.SliceSyncPool
|
||||
+ cfg ProtoStreamerConfig
|
||||
+ onUploadComplete func(ctx context.Context, sessionID session.ID) (apievents.AuditEvent, error)
|
||||
+ bufferPool *utils.BufferSyncPool
|
||||
+ slicePool *utils.SliceSyncPool
|
||||
}
|
||||
|
||||
// CreateAuditStreamForUpload creates audit stream for existing upload,
|
||||
@@ -1,15 +0,0 @@
|
||||
diff a/lib/service/service.go b/lib/service/service.go (rejected hunks)
|
||||
@@ -2503,7 +2504,12 @@ func (process *TeleportProcess) initAuthService() error {
|
||||
return trace.Wrap(err)
|
||||
}
|
||||
authServer.EncryptedIO = encryptedIO
|
||||
-
|
||||
+ if streamer != nil {
|
||||
+ streamer.SetOnUploadComplete(authServer.OnUploadComplete)
|
||||
+ }
|
||||
+ if localLog != nil {
|
||||
+ localLog.SetOnUploadComplete(authServer.OnUploadComplete)
|
||||
+ }
|
||||
lockWatcher, err := services.NewLockWatcher(process.ExitContext(), services.LockWatcherConfig{
|
||||
ResourceWatcherConfig: services.ResourceWatcherConfig{
|
||||
Component: teleport.ComponentAuth,
|
||||
Reference in New Issue
Block a user