diff --git a/docs/proto/proto.md b/docs/proto/proto.md index 5a7ca0c106..4f40b2f2cf 100644 --- a/docs/proto/proto.md +++ b/docs/proto/proto.md @@ -1439,6 +1439,7 @@ Represents NGINX details about a single NGINX instance | ssl | [NginxSslMetaData](#f5-nginx-agent-sdk-NginxSslMetaData) | | NGINX SSL metadata. | | status_url | [string](#string) | | Status URL. Example: http://localhost:8080/api | | configure_args | [string](#string) | repeated | Command line arguments that were used when the NGINX instance was started. Example: [ "", "with-http_stub_status_module" ] | +| error_log_paths | [string](#string) | repeated | Error log path. Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log | diff --git a/sdk/proto/nginx.pb.go b/sdk/proto/nginx.pb.go index d3d3ea688b..07f77032ef 100644 --- a/sdk/proto/nginx.pb.go +++ b/sdk/proto/nginx.pb.go @@ -166,7 +166,10 @@ type NginxDetails struct { StatusUrl string `protobuf:"bytes,12,opt,name=status_url,json=statusUrl,proto3" json:"status_url"` // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] - ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + ErrorLogPaths []string `protobuf:"bytes,14,rep,name=error_log_paths,json=errorLogPaths,proto3" json:"error_log_paths"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -296,6 +299,13 @@ func (m *NginxDetails) GetConfigureArgs() []string { return nil } +func (m *NginxDetails) GetErrorLogPaths() []string { + if m != nil { + return m.ErrorLogPaths + } + return nil +} + // swagger:model NginxPlusMetaData // Represents NGINX Plus metadata type NginxPlusMetaData struct { @@ -865,80 +875,82 @@ func init() { func init() { proto.RegisterFile("nginx.proto", fileDescriptor_917f1a70b1fd7255) } var fileDescriptor_917f1a70b1fd7255 = []byte{ - // 1166 bytes of a gzipped FileDescriptorProto + // 1192 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x0e, 0x2d, 0xd9, 0x22, 0x47, 0xb2, 0xcd, 0x6c, 0x5b, 0x80, 0x28, 0x52, 0x53, 0x60, 0x1b, - 0xd4, 0x4d, 0x51, 0x1b, 0x71, 0x5a, 0x14, 0x45, 0x83, 0x06, 0x92, 0xa5, 0x34, 0x46, 0x14, 0xc7, - 0x58, 0xcb, 0x69, 0xeb, 0x0b, 0xbb, 0x16, 0xd7, 0x34, 0x11, 0x4a, 0x14, 0x76, 0xa9, 0x20, 0xc9, - 0x33, 0xf4, 0x49, 0x7a, 0xeb, 0xb1, 0x6f, 0xd0, 0x5b, 0xfb, 0x04, 0x44, 0x91, 0x23, 0x2f, 0x7d, - 0x85, 0x82, 0xb3, 0x4b, 0x4a, 0xfe, 0x6b, 0x72, 0xe9, 0x85, 0x9a, 0xf9, 0x76, 0xbe, 0x6f, 0x39, - 0xb3, 0xb3, 0x43, 0x41, 0x73, 0x12, 0x46, 0x93, 0x97, 0x5b, 0x53, 0x91, 0xa4, 0x09, 0x21, 0xa7, - 0x5f, 0x6d, 0x29, 0x9f, 0x85, 0x7c, 0x92, 0x6e, 0xc9, 0xe0, 0xf9, 0x87, 0xad, 0x51, 0x32, 0x1e, - 0x27, 0x13, 0x15, 0x51, 0x78, 0x93, 0xd3, 0x28, 0xd4, 0x1e, 0x84, 0x49, 0x98, 0x28, 0xdb, 0xfb, - 0x73, 0x19, 0x5a, 0xfb, 0x05, 0xb7, 0xc7, 0x53, 0x16, 0xc5, 0x92, 0x7c, 0x0a, 0x26, 0x6a, 0xf9, - 0x51, 0xe0, 0x18, 0x6d, 0x63, 0xd3, 0xea, 0xb6, 0xf2, 0xcc, 0xad, 0x30, 0xda, 0x40, 0x6b, 0x2f, - 0x20, 0xb7, 0xa1, 0xf1, 0x82, 0x0b, 0x19, 0x25, 0x13, 0x67, 0x09, 0xe3, 0x9a, 0x79, 0xe6, 0x96, - 0x10, 0x2d, 0x0d, 0x72, 0x07, 0xac, 0x62, 0x73, 0x7f, 0xca, 0xd2, 0x33, 0xa7, 0x86, 0x81, 0xab, - 0x79, 0xe6, 0xce, 0x41, 0x6a, 0x16, 0xe6, 0x01, 0x4b, 0xcf, 0xc8, 0x17, 0x00, 0x53, 0x91, 0x8c, - 0xb8, 0x94, 0xc5, 0xee, 0x75, 0x0c, 0x5e, 0xcb, 0x33, 0x77, 0x01, 0xa5, 0x96, 0xb6, 0xf7, 0x02, - 0x72, 0x0f, 0x5a, 0xe5, 0x02, 0xaa, 0x2f, 0x23, 0xc1, 0xce, 0x33, 0xf7, 0x1c, 0x4e, 0x9b, 0xda, - 0x2b, 0xf7, 0x90, 0x29, 0x13, 0xa9, 0x9f, 0x46, 0x63, 0xee, 0xac, 0xb4, 0x8d, 0xcd, 0x9a, 0xda, - 0x63, 0x8e, 0x52, 0x0b, 0xed, 0x61, 0x34, 0xe6, 0xa4, 0x03, 0x37, 0x4f, 0x66, 0x51, 0x9c, 0xfa, - 0xa7, 0x22, 0x19, 0xfb, 0x32, 0x99, 0x89, 0x11, 0x77, 0x1a, 0x6d, 0x63, 0xd3, 0xec, 0x7e, 0x90, - 0x67, 0xee, 0xe5, 0x45, 0xba, 0x8e, 0xd0, 0x43, 0x91, 0x8c, 0x0f, 0x11, 0x20, 0x0f, 0xc0, 0x8e, - 0x13, 0x16, 0xb0, 0x93, 0x98, 0xfb, 0xe3, 0x24, 0x98, 0xc5, 0x5c, 0x3a, 0x66, 0xbb, 0xb6, 0x69, - 0x75, 0xdf, 0xcf, 0x33, 0xf7, 0xd2, 0x1a, 0x5d, 0x2f, 0x91, 0x27, 0x0a, 0x20, 0xf7, 0x61, 0x5d, - 0xcc, 0x26, 0xc5, 0x9b, 0x55, 0x7c, 0x0b, 0xf9, 0xef, 0xe5, 0x99, 0x7b, 0x71, 0x89, 0xae, 0x69, - 0xa0, 0x64, 0xef, 0x42, 0x7d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb9, 0x73, 0x7b, 0xeb, - 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x84, 0xa7, 0xac, 0xc7, 0x52, 0xd6, 0x35, - 0xf3, 0xcc, 0x45, 0x1a, 0xc5, 0x27, 0x79, 0x00, 0x35, 0x29, 0x63, 0xa7, 0x89, 0x1a, 0x9f, 0x5c, - 0xab, 0x71, 0x28, 0xe3, 0x4a, 0xa2, 0x91, 0x67, 0x6e, 0x41, 0xa2, 0xc5, 0x43, 0x97, 0x3d, 0x9d, - 0x49, 0x7f, 0x26, 0x62, 0xa7, 0x35, 0x3f, 0xda, 0x39, 0x8a, 0x65, 0x4f, 0x67, 0xf2, 0x48, 0xc4, - 0xe4, 0x1b, 0x58, 0x53, 0x2d, 0x3b, 0x13, 0xdc, 0x67, 0x22, 0x94, 0xce, 0x2a, 0x66, 0x4c, 0xf2, - 0xcc, 0xbd, 0xb0, 0x42, 0x57, 0x2b, 0xbf, 0x23, 0x42, 0xe9, 0x31, 0xb8, 0x79, 0x29, 0x9f, 0xa2, - 0x59, 0xf9, 0xa4, 0xa8, 0xa9, 0x6a, 0x6a, 0x53, 0x35, 0xab, 0x86, 0x68, 0x69, 0x14, 0x61, 0x82, - 0xc7, 0x9c, 0x49, 0xbe, 0xd8, 0xd3, 0x1a, 0xa2, 0xa5, 0xe1, 0xfd, 0x6e, 0x80, 0x7d, 0x31, 0x5f, - 0x72, 0x0c, 0xa6, 0x94, 0xb1, 0x9f, 0xbe, 0x9a, 0x72, 0xdc, 0x63, 0x6d, 0xe7, 0xee, 0xbb, 0xd4, - 0xa9, 0x02, 0x86, 0xaf, 0xa6, 0x5c, 0xdd, 0xb5, 0x52, 0x86, 0x36, 0xa4, 0x82, 0x8b, 0xf7, 0x0a, - 0xd4, 0xfd, 0x74, 0x96, 0xb0, 0x0e, 0xf8, 0x5e, 0x1a, 0xa2, 0xa5, 0xe1, 0x79, 0xfa, 0x2e, 0x6b, - 0x35, 0x62, 0xc1, 0x72, 0xf7, 0x68, 0x6f, 0x30, 0xb4, 0x6f, 0x90, 0x06, 0xd4, 0xe8, 0xd1, 0xbe, - 0x6d, 0x78, 0xbf, 0x2c, 0x41, 0x13, 0x83, 0x1e, 0x71, 0x16, 0xa7, 0x67, 0xef, 0x7e, 0xdf, 0x7f, - 0x86, 0x96, 0x02, 0xd5, 0x29, 0x61, 0x81, 0xd6, 0x76, 0x3e, 0xbf, 0x36, 0x47, 0xa5, 0xaf, 0xd3, - 0x43, 0x8a, 0xba, 0x9a, 0x8b, 0x22, 0x54, 0xcd, 0x31, 0xb5, 0x5c, 0xf4, 0x79, 0xc0, 0x43, 0xc1, - 0x02, 0x1e, 0xf8, 0x82, 0x33, 0x99, 0x4c, 0xf4, 0xc0, 0xc0, 0x3e, 0xbf, 0xb0, 0x44, 0xd7, 0x4a, - 0x80, 0xa2, 0xef, 0x7d, 0xa9, 0xf3, 0xd2, 0x62, 0x4d, 0x68, 0x1c, 0xed, 0x3f, 0xde, 0x7f, 0xfa, - 0xc3, 0xbe, 0x7d, 0x83, 0x00, 0xac, 0x74, 0x76, 0x87, 0x7b, 0xcf, 0xfa, 0xb6, 0x41, 0x5a, 0x60, - 0xf6, 0xfa, 0xdf, 0xd3, 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0x7f, 0xea, 0x9a, 0xb6, 0x8b, 0x4d, - 0x44, 0xf6, 0x60, 0x85, 0x8d, 0xd2, 0x62, 0xa8, 0xa9, 0x33, 0xbc, 0xfe, 0xbe, 0x28, 0x42, 0x07, - 0x83, 0xbb, 0x90, 0x67, 0xae, 0x26, 0x52, 0xfd, 0x4b, 0x9e, 0x41, 0x53, 0x75, 0xa6, 0x1f, 0xb0, - 0x94, 0x61, 0xbd, 0xae, 0xb9, 0x3b, 0x4a, 0xaa, 0xc7, 0xe5, 0x48, 0x44, 0xd3, 0x34, 0x11, 0xdd, - 0xf5, 0x3c, 0x73, 0x17, 0xc9, 0x14, 0x94, 0x83, 0x8d, 0xd6, 0x87, 0xc6, 0x6b, 0xe5, 0x62, 0x79, - 0x9a, 0x3b, 0x1b, 0x57, 0x69, 0x1e, 0x47, 0xd3, 0x29, 0x0f, 0x1e, 0x46, 0x31, 0x57, 0xcd, 0xa2, - 0x29, 0xb4, 0x34, 0xc8, 0x7d, 0xa8, 0xbf, 0x66, 0xb3, 0x97, 0x38, 0x66, 0xdf, 0xae, 0x81, 0x03, - 0xa1, 0x88, 0xa7, 0xf8, 0x24, 0x07, 0xd0, 0x64, 0x23, 0x1c, 0xb1, 0x71, 0x12, 0x4a, 0x1c, 0xbd, - 0xd7, 0x88, 0x74, 0x30, 0x6c, 0x90, 0x84, 0x52, 0xa5, 0xb5, 0x40, 0xa3, 0xc0, 0xaa, 0x45, 0x32, - 0x00, 0xe0, 0x42, 0x24, 0x42, 0x09, 0xae, 0xa0, 0xe0, 0x47, 0x57, 0x09, 0xf6, 0x8b, 0x28, 0xd4, - 0xc3, 0x01, 0x32, 0x27, 0x51, 0x8b, 0x97, 0x4b, 0xe4, 0x3b, 0x35, 0xb0, 0x1a, 0x28, 0xf3, 0xf1, - 0x55, 0x32, 0x87, 0x32, 0xde, 0xe5, 0x22, 0x8d, 0x4e, 0xa3, 0x11, 0x4b, 0xb9, 0xbc, 0x30, 0xaf, - 0x7e, 0x84, 0xd5, 0x20, 0x12, 0x7c, 0x94, 0x26, 0xe2, 0x95, 0x3f, 0x66, 0x53, 0xc7, 0x44, 0xa5, - 0xf6, 0x55, 0x4a, 0xbd, 0x32, 0xf0, 0x09, 0x9b, 0x76, 0x6f, 0xe6, 0x99, 0x7b, 0x9e, 0x4a, 0x5b, - 0xc1, 0x42, 0x80, 0x77, 0x0c, 0xd0, 0x39, 0x97, 0xf5, 0xbc, 0x20, 0x8e, 0xd1, 0xae, 0x5d, 0x97, - 0x75, 0xc5, 0x51, 0x59, 0xcf, 0x49, 0xd4, 0xaa, 0x8a, 0xe8, 0xfd, 0x6a, 0x80, 0x55, 0x05, 0x92, - 0x5b, 0x50, 0x9f, 0xb0, 0x31, 0xd7, 0xd7, 0x1a, 0x4f, 0xb0, 0xf0, 0x29, 0x3e, 0x89, 0x07, 0x2b, - 0xa7, 0x89, 0x18, 0xb3, 0x54, 0x8f, 0x3a, 0x6c, 0x61, 0x85, 0x50, 0xfd, 0x4b, 0xee, 0x42, 0x73, - 0xca, 0xc5, 0x38, 0x92, 0xc5, 0xa7, 0x5c, 0xea, 0xdb, 0x88, 0xa7, 0xb8, 0x00, 0xd3, 0x45, 0x87, - 0x6c, 0x82, 0x29, 0xb8, 0xfa, 0x7e, 0x61, 0x6b, 0x99, 0x6a, 0x9e, 0x94, 0x18, 0xad, 0x2c, 0xef, - 0x08, 0xac, 0xea, 0x28, 0xc9, 0x23, 0xb0, 0xaa, 0x83, 0xd4, 0x65, 0xb8, 0xf5, 0x5f, 0x87, 0xaf, - 0xfe, 0x44, 0x54, 0x14, 0x6a, 0x96, 0x47, 0xef, 0xfd, 0x66, 0x80, 0x59, 0x46, 0xbd, 0xa5, 0x04, - 0x77, 0xc0, 0x8a, 0x93, 0xd0, 0x8f, 0xf9, 0x0b, 0x1e, 0xeb, 0x2a, 0xa0, 0x6c, 0x05, 0x52, 0x33, - 0x4e, 0xc2, 0x41, 0x61, 0xfd, 0xaf, 0xa5, 0xb8, 0x73, 0xac, 0xbf, 0x59, 0x8b, 0x33, 0xe5, 0xfc, - 0x04, 0xb3, 0x60, 0xb9, 0x73, 0x70, 0x30, 0xf8, 0xc9, 0x36, 0x88, 0x09, 0xf5, 0x61, 0xff, 0x70, - 0x68, 0x2f, 0x15, 0xa3, 0x8c, 0x3e, 0x1d, 0x0c, 0xba, 0x9d, 0xdd, 0xc7, 0x76, 0xad, 0x18, 0x72, - 0xb4, 0x3f, 0x3c, 0xa2, 0xfb, 0x76, 0xbd, 0x08, 0x7f, 0xf8, 0x94, 0xee, 0xf6, 0xed, 0xe5, 0xee, - 0xd7, 0x7f, 0xbc, 0xd9, 0x30, 0xfe, 0x7a, 0xb3, 0x61, 0xfc, 0xfd, 0x66, 0xc3, 0x38, 0xfe, 0x2c, - 0x8c, 0xd2, 0xb3, 0xd9, 0xc9, 0xd6, 0x28, 0x19, 0x6f, 0x63, 0x6d, 0xb7, 0xb1, 0xb6, 0xdb, 0x32, - 0x78, 0xbe, 0xfd, 0x62, 0x67, 0x1b, 0xff, 0x14, 0x7e, 0x8b, 0xcf, 0x93, 0x15, 0xfc, 0xb9, 0xf7, - 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x80, 0x5c, 0xfb, 0x6c, 0x0a, 0x00, 0x00, + 0x17, 0x0d, 0x6d, 0xd9, 0x22, 0xaf, 0x64, 0x99, 0x99, 0xef, 0x2b, 0x40, 0x14, 0xa9, 0x29, 0xb0, + 0x0d, 0xea, 0xa6, 0xa8, 0x8d, 0x38, 0x2d, 0x8a, 0x22, 0x41, 0x03, 0xc9, 0x52, 0x1a, 0x23, 0x8a, + 0x63, 0x8c, 0xe5, 0xb4, 0xf5, 0x86, 0x1d, 0x8b, 0x63, 0x9a, 0x08, 0x25, 0x0a, 0x33, 0x54, 0x90, + 0xe4, 0x19, 0xf2, 0x24, 0xdd, 0x75, 0xd9, 0x37, 0xe8, 0xb2, 0x4f, 0x40, 0x14, 0x59, 0x72, 0xd3, + 0x57, 0x28, 0x78, 0x67, 0x48, 0xc9, 0x7f, 0x4d, 0x36, 0xdd, 0x90, 0x77, 0xce, 0xdc, 0x7b, 0xc8, + 0xb9, 0x3f, 0x87, 0x84, 0xc6, 0x24, 0x8c, 0x26, 0xaf, 0xb6, 0xa6, 0x22, 0x49, 0x13, 0x42, 0x4e, + 0xbf, 0xd9, 0x52, 0x6b, 0x16, 0xf2, 0x49, 0xba, 0x25, 0x83, 0x17, 0x1f, 0x37, 0x47, 0xc9, 0x78, + 0x9c, 0x4c, 0x94, 0x47, 0xb1, 0x9a, 0x9c, 0x46, 0xa1, 0x5e, 0x41, 0x98, 0x84, 0x89, 0xb2, 0xbd, + 0xb7, 0xab, 0xd0, 0xdc, 0x2f, 0x62, 0x7b, 0x3c, 0x65, 0x51, 0x2c, 0xc9, 0xe7, 0x60, 0x22, 0x97, + 0x1f, 0x05, 0x8e, 0xd1, 0x36, 0x36, 0xad, 0x6e, 0x33, 0xcf, 0xdc, 0x0a, 0xa3, 0x75, 0xb4, 0xf6, + 0x02, 0x72, 0x1b, 0xea, 0x2f, 0xb9, 0x90, 0x51, 0x32, 0x71, 0x96, 0xd0, 0xaf, 0x91, 0x67, 0x6e, + 0x09, 0xd1, 0xd2, 0x20, 0x77, 0xc0, 0x2a, 0x1e, 0xee, 0x4f, 0x59, 0x7a, 0xe6, 0x2c, 0xa3, 0xe3, + 0x5a, 0x9e, 0xb9, 0x73, 0x90, 0x9a, 0x85, 0x79, 0xc0, 0xd2, 0x33, 0xf2, 0x15, 0xc0, 0x54, 0x24, + 0x23, 0x2e, 0x65, 0xf1, 0xf4, 0x1a, 0x3a, 0xb7, 0xf2, 0xcc, 0x5d, 0x40, 0xa9, 0xa5, 0xed, 0xbd, + 0x80, 0xdc, 0x83, 0x66, 0xb9, 0x81, 0xec, 0x2b, 0x18, 0x60, 0xe7, 0x99, 0x7b, 0x0e, 0xa7, 0x0d, + 0xbd, 0x2a, 0x9f, 0x21, 0x53, 0x26, 0x52, 0x3f, 0x8d, 0xc6, 0xdc, 0x59, 0x6d, 0x1b, 0x9b, 0xcb, + 0xea, 0x19, 0x73, 0x94, 0x5a, 0x68, 0x0f, 0xa3, 0x31, 0x27, 0x1d, 0xb8, 0x79, 0x32, 0x8b, 0xe2, + 0xd4, 0x3f, 0x15, 0xc9, 0xd8, 0x97, 0xc9, 0x4c, 0x8c, 0xb8, 0x53, 0x6f, 0x1b, 0x9b, 0x66, 0xf7, + 0xa3, 0x3c, 0x73, 0x2f, 0x6f, 0xd2, 0x75, 0x84, 0x1e, 0x89, 0x64, 0x7c, 0x88, 0x00, 0x79, 0x08, + 0x76, 0x9c, 0xb0, 0x80, 0x9d, 0xc4, 0xdc, 0x1f, 0x27, 0xc1, 0x2c, 0xe6, 0xd2, 0x31, 0xdb, 0xcb, + 0x9b, 0x56, 0xf7, 0xff, 0x79, 0xe6, 0x5e, 0xda, 0xa3, 0xeb, 0x25, 0xf2, 0x54, 0x01, 0xe4, 0x01, + 0xac, 0x8b, 0xd9, 0xa4, 0x78, 0xb3, 0x2a, 0xde, 0xc2, 0xf8, 0xff, 0xe5, 0x99, 0x7b, 0x71, 0x8b, + 0xb6, 0x34, 0x50, 0x46, 0xef, 0x42, 0x6d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb1, 0x73, + 0x7b, 0xeb, 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x94, 0xa7, 0xac, 0xc7, 0x52, + 0xd6, 0x35, 0xf3, 0xcc, 0xc5, 0x30, 0x8a, 0x57, 0xf2, 0x10, 0x96, 0xa5, 0x8c, 0x9d, 0x06, 0x72, + 0x7c, 0x76, 0x2d, 0xc7, 0xa1, 0x8c, 0x2b, 0x8a, 0x7a, 0x9e, 0xb9, 0x45, 0x10, 0x2d, 0x2e, 0x3a, + 0xed, 0xe9, 0x4c, 0xfa, 0x33, 0x11, 0x3b, 0xcd, 0x79, 0x69, 0xe7, 0x28, 0xa6, 0x3d, 0x9d, 0xc9, + 0x23, 0x11, 0x93, 0xef, 0xa0, 0xa5, 0x5a, 0x76, 0x26, 0xb8, 0xcf, 0x44, 0x28, 0x9d, 0x35, 0x3c, + 0x31, 0xc9, 0x33, 0xf7, 0xc2, 0x0e, 0x5d, 0xab, 0xd6, 0x1d, 0x11, 0x4a, 0x72, 0x1f, 0xd6, 0xb9, + 0x10, 0x89, 0xf0, 0xe3, 0x24, 0xc4, 0xfa, 0x4b, 0xa7, 0x35, 0xcf, 0xd6, 0x85, 0x2d, 0xba, 0x86, + 0xc0, 0x20, 0x09, 0x8b, 0xe6, 0x90, 0x1e, 0x83, 0x9b, 0x97, 0x92, 0x51, 0x74, 0x3a, 0x9f, 0x14, + 0x05, 0x51, 0x13, 0x61, 0xaa, 0x4e, 0xd7, 0x10, 0x2d, 0x8d, 0xc2, 0x4d, 0xf0, 0x98, 0x33, 0xc9, + 0x17, 0x07, 0x42, 0x43, 0xb4, 0x34, 0xbc, 0xdf, 0x0d, 0xb0, 0x2f, 0x26, 0x8b, 0x1c, 0x83, 0x29, + 0x65, 0xec, 0xa7, 0xaf, 0xa7, 0x1c, 0x9f, 0xd1, 0xda, 0xb9, 0xfb, 0x21, 0x49, 0xae, 0x80, 0xe1, + 0xeb, 0x29, 0x57, 0x83, 0x5a, 0xd2, 0xd0, 0xba, 0x54, 0x70, 0xf1, 0x5e, 0x81, 0x1a, 0x6e, 0x67, + 0x09, 0x13, 0x81, 0xef, 0xa5, 0x21, 0x5a, 0x1a, 0x9e, 0xa7, 0x85, 0x40, 0xb3, 0x11, 0x0b, 0x56, + 0xba, 0x47, 0x7b, 0x83, 0xa1, 0x7d, 0x83, 0xd4, 0x61, 0x99, 0x1e, 0xed, 0xdb, 0x86, 0xf7, 0x76, + 0x09, 0x1a, 0xe8, 0xf4, 0x98, 0xb3, 0x38, 0x3d, 0xfb, 0x70, 0xb1, 0xf8, 0x05, 0x9a, 0x0a, 0x54, + 0x25, 0xc6, 0x04, 0xb5, 0x76, 0xbe, 0xbc, 0xf6, 0x8c, 0x8a, 0x5f, 0x1f, 0x0f, 0x43, 0xd4, 0x5c, + 0x2f, 0x92, 0x50, 0x25, 0x82, 0x6a, 0xbb, 0x18, 0x92, 0x80, 0x87, 0x82, 0x05, 0x3c, 0xf0, 0x05, + 0x67, 0x32, 0x99, 0x68, 0xb5, 0xc1, 0xb2, 0x5f, 0xd8, 0xa2, 0xad, 0x12, 0xa0, 0xb8, 0xf6, 0xbe, + 0xd6, 0xe7, 0xd2, 0x64, 0x0d, 0xa8, 0x1f, 0xed, 0x3f, 0xd9, 0x7f, 0xf6, 0xe3, 0xbe, 0x7d, 0x83, + 0x00, 0xac, 0x76, 0x76, 0x87, 0x7b, 0xcf, 0xfb, 0xb6, 0x41, 0x9a, 0x60, 0xf6, 0xfa, 0x3f, 0xd0, + 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0xbf, 0x6b, 0x3a, 0x6c, 0x17, 0x3b, 0x90, 0xec, 0xc1, 0x2a, + 0x1b, 0xa5, 0x85, 0x22, 0xaa, 0x1a, 0x5e, 0x3f, 0x6c, 0x2a, 0xa0, 0x83, 0xce, 0x5d, 0xc8, 0x33, + 0x57, 0x07, 0x52, 0x7d, 0x27, 0xcf, 0xa1, 0xa1, 0xda, 0xda, 0x0f, 0x58, 0xca, 0x30, 0x5f, 0xd7, + 0x0c, 0x9e, 0xa2, 0xea, 0x71, 0x39, 0x12, 0xd1, 0x34, 0x4d, 0x44, 0x77, 0x3d, 0xcf, 0xdc, 0xc5, + 0x60, 0x0a, 0x6a, 0x81, 0x8d, 0xd6, 0x87, 0xfa, 0x1b, 0xb5, 0xc4, 0xf4, 0x34, 0x76, 0x36, 0xae, + 0xe2, 0x3c, 0x8e, 0xa6, 0x53, 0x1e, 0x3c, 0x8a, 0x62, 0xae, 0x9a, 0x45, 0x87, 0xd0, 0xd2, 0x20, + 0x0f, 0xa0, 0xf6, 0x86, 0xcd, 0x5e, 0xa1, 0x46, 0xbf, 0x9f, 0x03, 0xd5, 0xa4, 0xf0, 0xa7, 0x78, + 0x25, 0x07, 0xd0, 0x60, 0x23, 0xd4, 0xe7, 0x38, 0x09, 0x25, 0xea, 0xf6, 0x35, 0x24, 0x1d, 0x74, + 0x1b, 0x24, 0xa1, 0x54, 0xc7, 0x5a, 0x08, 0xa3, 0xc0, 0xaa, 0x4d, 0x32, 0x00, 0xa8, 0x26, 0x5b, + 0xa2, 0xaa, 0x37, 0x76, 0x3e, 0xb9, 0x8a, 0xb0, 0xaf, 0xc7, 0x5d, 0x2a, 0xf5, 0x99, 0x07, 0x51, + 0xab, 0x54, 0x02, 0x49, 0xbe, 0x57, 0x6a, 0x57, 0x47, 0x9a, 0x4f, 0xaf, 0xa2, 0x39, 0x94, 0xf1, + 0x2e, 0x17, 0x69, 0x74, 0x1a, 0x8d, 0x58, 0xca, 0xe5, 0x05, 0xb1, 0xfb, 0x09, 0xd6, 0x82, 0x48, + 0xf0, 0x51, 0x9a, 0x88, 0xd7, 0xfe, 0x98, 0x4d, 0x1d, 0x13, 0x99, 0xda, 0x57, 0x31, 0xf5, 0x4a, + 0xc7, 0xa7, 0x6c, 0xda, 0xbd, 0x99, 0x67, 0xee, 0xf9, 0x50, 0xda, 0x0c, 0x16, 0x1c, 0xbc, 0x63, + 0x80, 0xce, 0xb9, 0x53, 0xcf, 0x13, 0xe2, 0x18, 0xed, 0xe5, 0xeb, 0x4e, 0x5d, 0xc5, 0xa8, 0x53, + 0xcf, 0x83, 0xa8, 0x55, 0x25, 0xd1, 0xfb, 0xd5, 0x00, 0xab, 0x72, 0x24, 0xb7, 0xa0, 0x36, 0x61, + 0x63, 0xae, 0xc7, 0x1a, 0x2b, 0x58, 0xac, 0x29, 0x5e, 0x89, 0x07, 0xab, 0xa7, 0x89, 0x18, 0xb3, + 0x54, 0x4b, 0x1d, 0xb6, 0xb0, 0x42, 0xa8, 0xbe, 0x93, 0xbb, 0xd0, 0x98, 0x72, 0x31, 0x8e, 0x64, + 0xf1, 0x1f, 0x20, 0xf5, 0x34, 0x62, 0x15, 0x17, 0x60, 0xba, 0xb8, 0x20, 0x9b, 0x60, 0x0a, 0xae, + 0x3e, 0x7e, 0xd8, 0x5a, 0xa6, 0xd2, 0x93, 0x12, 0xa3, 0x95, 0xe5, 0x1d, 0x81, 0x55, 0x95, 0x92, + 0x3c, 0x06, 0xab, 0x2a, 0xa4, 0x4e, 0xc3, 0xad, 0x7f, 0x2b, 0xbe, 0xfa, 0x03, 0xa9, 0x42, 0xa8, + 0x59, 0x96, 0xde, 0xfb, 0xcd, 0x00, 0xb3, 0xf4, 0x7a, 0x4f, 0x0a, 0xee, 0x80, 0x55, 0x7c, 0x46, + 0x62, 0xfe, 0x92, 0xc7, 0x3a, 0x0b, 0x48, 0x5b, 0x81, 0xd4, 0x8c, 0x93, 0x70, 0x50, 0x58, 0xff, + 0x69, 0x2a, 0xee, 0x1c, 0xeb, 0x6f, 0xd6, 0xa2, 0xa6, 0x9c, 0x57, 0x30, 0x0b, 0x56, 0x3a, 0x07, + 0x07, 0x83, 0x9f, 0x6d, 0x83, 0x98, 0x50, 0x1b, 0xf6, 0x0f, 0x87, 0xf6, 0x52, 0x21, 0x65, 0xf4, + 0xd9, 0x60, 0xd0, 0xed, 0xec, 0x3e, 0xb1, 0x97, 0x0b, 0x91, 0xa3, 0xfd, 0xe1, 0x11, 0xdd, 0xb7, + 0x6b, 0x85, 0xfb, 0xa3, 0x67, 0x74, 0xb7, 0x6f, 0xaf, 0x74, 0xbf, 0xfd, 0xe3, 0xdd, 0x86, 0xf1, + 0xe7, 0xbb, 0x0d, 0xe3, 0xaf, 0x77, 0x1b, 0xc6, 0xf1, 0x17, 0x61, 0x94, 0x9e, 0xcd, 0x4e, 0xb6, + 0x46, 0xc9, 0x78, 0x1b, 0x73, 0xbb, 0x8d, 0xb9, 0xdd, 0x96, 0xc1, 0x8b, 0xed, 0x97, 0x3b, 0xdb, + 0xf8, 0x47, 0x79, 0x1f, 0xaf, 0x27, 0xab, 0x78, 0xbb, 0xf7, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x72, 0x41, 0x36, 0xe8, 0xa9, 0x0a, 0x00, 0x00, } func (m *NginxDetails) Marshal() (dAtA []byte, err error) { @@ -965,6 +977,15 @@ func (m *NginxDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.ErrorLogPaths) > 0 { + for iNdEx := len(m.ErrorLogPaths) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.ErrorLogPaths[iNdEx]) + copy(dAtA[i:], m.ErrorLogPaths[iNdEx]) + i = encodeVarintNginx(dAtA, i, uint64(len(m.ErrorLogPaths[iNdEx]))) + i-- + dAtA[i] = 0x72 + } + } if len(m.ConfigureArgs) > 0 { for iNdEx := len(m.ConfigureArgs) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.ConfigureArgs[iNdEx]) @@ -1594,6 +1615,12 @@ func (m *NginxDetails) Size() (n int) { n += 1 + l + sovNginx(uint64(l)) } } + if len(m.ErrorLogPaths) > 0 { + for _, s := range m.ErrorLogPaths { + l = len(s) + n += 1 + l + sovNginx(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2230,6 +2257,38 @@ func (m *NginxDetails) Unmarshal(dAtA []byte) error { } m.ConfigureArgs = append(m.ConfigureArgs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrorLogPaths", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNginx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNginx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNginx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ErrorLogPaths = append(m.ErrorLogPaths, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipNginx(dAtA[iNdEx:]) diff --git a/sdk/proto/nginx.proto b/sdk/proto/nginx.proto index 7ac92921b4..e458b7a73a 100644 --- a/sdk/proto/nginx.proto +++ b/sdk/proto/nginx.proto @@ -47,6 +47,9 @@ message NginxDetails { // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] repeated string configure_args = 13 [(gogoproto.jsontag) = "configure_args"]; + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + repeated string error_log_paths = 14 [(gogoproto.jsontag) = "error_log_paths"]; } // swagger:model NginxPlusMetaData diff --git a/src/core/nginx.go b/src/core/nginx.go index d9853555b2..577abc6c05 100644 --- a/src/core/nginx.go +++ b/src/core/nginx.go @@ -47,7 +47,7 @@ type NginxBinary interface { Start(nginxId, bin string) error Stop(processId, bin string) error Reload(processId, bin string) error - ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error + ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error GetNginxDetailsFromProcess(nginxProcess *Process) *proto.NginxDetails GetNginxDetailsByID(nginxID string) *proto.NginxDetails GetNginxIDForProcess(nginxProcess *Process) string @@ -209,6 +209,10 @@ func (n *NginxBinaryType) GetNginxDetailsFromProcess(nginxProcess *Process) *pro log.Tracef("Custom conf path set: %v", path) nginxDetailsFacade.ConfPath = path } + if errorLogPaths := getErrorLogPathFromCommand(nginxProcess.Command); len(errorLogPaths) > 0 { + log.Tracef("Custom error log paths set: %v", errorLogPaths) + nginxDetailsFacade.ErrorLogPaths = errorLogPaths + } n.statusUrlMutex.RLock() urlsLength := len(n.statusUrls) @@ -290,15 +294,25 @@ func (n *NginxBinaryType) Reload(processId, bin string) error { } // ValidateConfig tests the config with nginx -t -c configLocation. -func (n *NginxBinaryType) ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { - log.Debugf("Validating config, %s for nginx process, %s", configLocation, processId) - response, err := runCmd(bin, "-t", "-c", configLocation) +func (n *NginxBinaryType) ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { + log.Debugf("Validating config, %s for nginx process, %s, with custom error path %v", configLocation, processId, errorLogPaths) + cmdArgs := make([]string, 0) + cmdArgs = append(cmdArgs, "-t") + if len(configLocation) > 0 { + cmdArgs = append(cmdArgs, "-c") + cmdArgs = append(cmdArgs, configLocation) + } + for _, path := range errorLogPaths { + cmdArgs = append(cmdArgs, "-e") + cmdArgs = append(cmdArgs, path) + } + response, err := runCmd(bin, cmdArgs...) if err != nil { confFiles, auxFiles, getNginxConfigFilesErr := sdk.GetNginxConfigFiles(config) if getNginxConfigFilesErr == nil { n.writeBackup(config, confFiles, auxFiles) } - return fmt.Errorf("error running nginx -t -c %v:\n%s", configLocation, response) + return fmt.Errorf("error running nginx %v:\n%s", strings.Join(cmdArgs, " "), response) } err = n.validateConfigCheckResponse(response, configLocation) @@ -753,6 +767,20 @@ func getConfPathFromCommand(command string) string { return "" } +func getErrorLogPathFromCommand(command string) []string { + commands := strings.Split(command, " ") + errorPath := make([]string, 0) + + for i, command := range commands { + if command == "-e" { + if i < len(commands)-1 { + errorPath = append(errorPath, commands[i+1]) + } + } + } + return errorPath +} + func parseConfigureArguments(line string) (result map[string]interface{}, flags []string) { // need to check for empty strings flags = strings.Split(line[len("configure arguments:"):], " --") diff --git a/src/plugins/nginx.go b/src/plugins/nginx.go index 5036c71237..0128423cc1 100644 --- a/src/plugins/nginx.go +++ b/src/plugins/nginx.go @@ -440,7 +440,7 @@ func (n *Nginx) writeConfigAndReloadNginx(correlationId string, config *proto.Ng func (n *Nginx) validateConfig(nginx *proto.NginxDetails, correlationId string, config *proto.NginxConfig, configApply *sdk.ConfigApply) { start := time.Now() - err := n.nginxBinary.ValidateConfig(nginx.NginxId, nginx.ProcessPath, nginx.ConfPath, config, configApply) + err := n.nginxBinary.ValidateConfig(nginx.NginxId, nginx.ProcessPath, nginx.ConfPath, nginx.ErrorLogPaths, config, configApply) if err == nil { _, err = n.nginxBinary.ReadConfig(nginx.GetConfPath(), config.GetConfigData().GetNginxId(), n.env.GetSystemUUID()) } diff --git a/src/plugins/nginx_test.go b/src/plugins/nginx_test.go index 8580572750..bdcd75b13f 100644 --- a/src/plugins/nginx_test.go +++ b/src/plugins/nginx_test.go @@ -541,7 +541,7 @@ func TestNginxConfigApply(t *testing.T) { binary := tutils.NewMockNginxBinary() binary.On("WriteConfig", mock.Anything).Return(config, nil) - binary.On("ValidateConfig", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil) + binary.On("ValidateConfig", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil) binary.On("ReadConfig", mock.Anything, mock.Anything, mock.Anything).Return(test.config, nil) binary.On("GetNginxDetailsByID", "12345").Return(tutils.GetDetailsMap()["12345"]) binary.On("UpdateNginxDetailsFromProcesses", env.Processes()) @@ -806,7 +806,7 @@ func TestNginx_validateConfig(t *testing.T) { t.Run(test.name, func(tt *testing.T) { env := tutils.GetMockEnvWithProcess() binary := tutils.NewMockNginxBinary() - binary.On("ValidateConfig", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(test.validationResult) + binary.On("ValidateConfig", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(test.validationResult) binary.On("ReadConfig", mock.Anything, mock.Anything, mock.Anything).Return(&proto.NginxConfig{}, nil) binary.On("GetNginxDetailsMapFromProcesses", env.Processes()).Return(tutils.GetDetailsMap()) binary.On("UpdateNginxDetailsFromProcesses", env.Processes()) diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go index d3d3ea688b..07f77032ef 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go @@ -166,7 +166,10 @@ type NginxDetails struct { StatusUrl string `protobuf:"bytes,12,opt,name=status_url,json=statusUrl,proto3" json:"status_url"` // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] - ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + ErrorLogPaths []string `protobuf:"bytes,14,rep,name=error_log_paths,json=errorLogPaths,proto3" json:"error_log_paths"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -296,6 +299,13 @@ func (m *NginxDetails) GetConfigureArgs() []string { return nil } +func (m *NginxDetails) GetErrorLogPaths() []string { + if m != nil { + return m.ErrorLogPaths + } + return nil +} + // swagger:model NginxPlusMetaData // Represents NGINX Plus metadata type NginxPlusMetaData struct { @@ -865,80 +875,82 @@ func init() { func init() { proto.RegisterFile("nginx.proto", fileDescriptor_917f1a70b1fd7255) } var fileDescriptor_917f1a70b1fd7255 = []byte{ - // 1166 bytes of a gzipped FileDescriptorProto + // 1192 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x0e, 0x2d, 0xd9, 0x22, 0x47, 0xb2, 0xcd, 0x6c, 0x5b, 0x80, 0x28, 0x52, 0x53, 0x60, 0x1b, - 0xd4, 0x4d, 0x51, 0x1b, 0x71, 0x5a, 0x14, 0x45, 0x83, 0x06, 0x92, 0xa5, 0x34, 0x46, 0x14, 0xc7, - 0x58, 0xcb, 0x69, 0xeb, 0x0b, 0xbb, 0x16, 0xd7, 0x34, 0x11, 0x4a, 0x14, 0x76, 0xa9, 0x20, 0xc9, - 0x33, 0xf4, 0x49, 0x7a, 0xeb, 0xb1, 0x6f, 0xd0, 0x5b, 0xfb, 0x04, 0x44, 0x91, 0x23, 0x2f, 0x7d, - 0x85, 0x82, 0xb3, 0x4b, 0x4a, 0xfe, 0x6b, 0x72, 0xe9, 0x85, 0x9a, 0xf9, 0x76, 0xbe, 0x6f, 0x39, - 0xb3, 0xb3, 0x43, 0x41, 0x73, 0x12, 0x46, 0x93, 0x97, 0x5b, 0x53, 0x91, 0xa4, 0x09, 0x21, 0xa7, - 0x5f, 0x6d, 0x29, 0x9f, 0x85, 0x7c, 0x92, 0x6e, 0xc9, 0xe0, 0xf9, 0x87, 0xad, 0x51, 0x32, 0x1e, - 0x27, 0x13, 0x15, 0x51, 0x78, 0x93, 0xd3, 0x28, 0xd4, 0x1e, 0x84, 0x49, 0x98, 0x28, 0xdb, 0xfb, - 0x73, 0x19, 0x5a, 0xfb, 0x05, 0xb7, 0xc7, 0x53, 0x16, 0xc5, 0x92, 0x7c, 0x0a, 0x26, 0x6a, 0xf9, - 0x51, 0xe0, 0x18, 0x6d, 0x63, 0xd3, 0xea, 0xb6, 0xf2, 0xcc, 0xad, 0x30, 0xda, 0x40, 0x6b, 0x2f, - 0x20, 0xb7, 0xa1, 0xf1, 0x82, 0x0b, 0x19, 0x25, 0x13, 0x67, 0x09, 0xe3, 0x9a, 0x79, 0xe6, 0x96, - 0x10, 0x2d, 0x0d, 0x72, 0x07, 0xac, 0x62, 0x73, 0x7f, 0xca, 0xd2, 0x33, 0xa7, 0x86, 0x81, 0xab, - 0x79, 0xe6, 0xce, 0x41, 0x6a, 0x16, 0xe6, 0x01, 0x4b, 0xcf, 0xc8, 0x17, 0x00, 0x53, 0x91, 0x8c, - 0xb8, 0x94, 0xc5, 0xee, 0x75, 0x0c, 0x5e, 0xcb, 0x33, 0x77, 0x01, 0xa5, 0x96, 0xb6, 0xf7, 0x02, - 0x72, 0x0f, 0x5a, 0xe5, 0x02, 0xaa, 0x2f, 0x23, 0xc1, 0xce, 0x33, 0xf7, 0x1c, 0x4e, 0x9b, 0xda, - 0x2b, 0xf7, 0x90, 0x29, 0x13, 0xa9, 0x9f, 0x46, 0x63, 0xee, 0xac, 0xb4, 0x8d, 0xcd, 0x9a, 0xda, - 0x63, 0x8e, 0x52, 0x0b, 0xed, 0x61, 0x34, 0xe6, 0xa4, 0x03, 0x37, 0x4f, 0x66, 0x51, 0x9c, 0xfa, - 0xa7, 0x22, 0x19, 0xfb, 0x32, 0x99, 0x89, 0x11, 0x77, 0x1a, 0x6d, 0x63, 0xd3, 0xec, 0x7e, 0x90, - 0x67, 0xee, 0xe5, 0x45, 0xba, 0x8e, 0xd0, 0x43, 0x91, 0x8c, 0x0f, 0x11, 0x20, 0x0f, 0xc0, 0x8e, - 0x13, 0x16, 0xb0, 0x93, 0x98, 0xfb, 0xe3, 0x24, 0x98, 0xc5, 0x5c, 0x3a, 0x66, 0xbb, 0xb6, 0x69, - 0x75, 0xdf, 0xcf, 0x33, 0xf7, 0xd2, 0x1a, 0x5d, 0x2f, 0x91, 0x27, 0x0a, 0x20, 0xf7, 0x61, 0x5d, - 0xcc, 0x26, 0xc5, 0x9b, 0x55, 0x7c, 0x0b, 0xf9, 0xef, 0xe5, 0x99, 0x7b, 0x71, 0x89, 0xae, 0x69, - 0xa0, 0x64, 0xef, 0x42, 0x7d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb9, 0x73, 0x7b, 0xeb, - 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x84, 0xa7, 0xac, 0xc7, 0x52, 0xd6, 0x35, - 0xf3, 0xcc, 0x45, 0x1a, 0xc5, 0x27, 0x79, 0x00, 0x35, 0x29, 0x63, 0xa7, 0x89, 0x1a, 0x9f, 0x5c, - 0xab, 0x71, 0x28, 0xe3, 0x4a, 0xa2, 0x91, 0x67, 0x6e, 0x41, 0xa2, 0xc5, 0x43, 0x97, 0x3d, 0x9d, - 0x49, 0x7f, 0x26, 0x62, 0xa7, 0x35, 0x3f, 0xda, 0x39, 0x8a, 0x65, 0x4f, 0x67, 0xf2, 0x48, 0xc4, - 0xe4, 0x1b, 0x58, 0x53, 0x2d, 0x3b, 0x13, 0xdc, 0x67, 0x22, 0x94, 0xce, 0x2a, 0x66, 0x4c, 0xf2, - 0xcc, 0xbd, 0xb0, 0x42, 0x57, 0x2b, 0xbf, 0x23, 0x42, 0xe9, 0x31, 0xb8, 0x79, 0x29, 0x9f, 0xa2, - 0x59, 0xf9, 0xa4, 0xa8, 0xa9, 0x6a, 0x6a, 0x53, 0x35, 0xab, 0x86, 0x68, 0x69, 0x14, 0x61, 0x82, - 0xc7, 0x9c, 0x49, 0xbe, 0xd8, 0xd3, 0x1a, 0xa2, 0xa5, 0xe1, 0xfd, 0x6e, 0x80, 0x7d, 0x31, 0x5f, - 0x72, 0x0c, 0xa6, 0x94, 0xb1, 0x9f, 0xbe, 0x9a, 0x72, 0xdc, 0x63, 0x6d, 0xe7, 0xee, 0xbb, 0xd4, - 0xa9, 0x02, 0x86, 0xaf, 0xa6, 0x5c, 0xdd, 0xb5, 0x52, 0x86, 0x36, 0xa4, 0x82, 0x8b, 0xf7, 0x0a, - 0xd4, 0xfd, 0x74, 0x96, 0xb0, 0x0e, 0xf8, 0x5e, 0x1a, 0xa2, 0xa5, 0xe1, 0x79, 0xfa, 0x2e, 0x6b, - 0x35, 0x62, 0xc1, 0x72, 0xf7, 0x68, 0x6f, 0x30, 0xb4, 0x6f, 0x90, 0x06, 0xd4, 0xe8, 0xd1, 0xbe, - 0x6d, 0x78, 0xbf, 0x2c, 0x41, 0x13, 0x83, 0x1e, 0x71, 0x16, 0xa7, 0x67, 0xef, 0x7e, 0xdf, 0x7f, - 0x86, 0x96, 0x02, 0xd5, 0x29, 0x61, 0x81, 0xd6, 0x76, 0x3e, 0xbf, 0x36, 0x47, 0xa5, 0xaf, 0xd3, - 0x43, 0x8a, 0xba, 0x9a, 0x8b, 0x22, 0x54, 0xcd, 0x31, 0xb5, 0x5c, 0xf4, 0x79, 0xc0, 0x43, 0xc1, - 0x02, 0x1e, 0xf8, 0x82, 0x33, 0x99, 0x4c, 0xf4, 0xc0, 0xc0, 0x3e, 0xbf, 0xb0, 0x44, 0xd7, 0x4a, - 0x80, 0xa2, 0xef, 0x7d, 0xa9, 0xf3, 0xd2, 0x62, 0x4d, 0x68, 0x1c, 0xed, 0x3f, 0xde, 0x7f, 0xfa, - 0xc3, 0xbe, 0x7d, 0x83, 0x00, 0xac, 0x74, 0x76, 0x87, 0x7b, 0xcf, 0xfa, 0xb6, 0x41, 0x5a, 0x60, - 0xf6, 0xfa, 0xdf, 0xd3, 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0x7f, 0xea, 0x9a, 0xb6, 0x8b, 0x4d, - 0x44, 0xf6, 0x60, 0x85, 0x8d, 0xd2, 0x62, 0xa8, 0xa9, 0x33, 0xbc, 0xfe, 0xbe, 0x28, 0x42, 0x07, - 0x83, 0xbb, 0x90, 0x67, 0xae, 0x26, 0x52, 0xfd, 0x4b, 0x9e, 0x41, 0x53, 0x75, 0xa6, 0x1f, 0xb0, - 0x94, 0x61, 0xbd, 0xae, 0xb9, 0x3b, 0x4a, 0xaa, 0xc7, 0xe5, 0x48, 0x44, 0xd3, 0x34, 0x11, 0xdd, - 0xf5, 0x3c, 0x73, 0x17, 0xc9, 0x14, 0x94, 0x83, 0x8d, 0xd6, 0x87, 0xc6, 0x6b, 0xe5, 0x62, 0x79, - 0x9a, 0x3b, 0x1b, 0x57, 0x69, 0x1e, 0x47, 0xd3, 0x29, 0x0f, 0x1e, 0x46, 0x31, 0x57, 0xcd, 0xa2, - 0x29, 0xb4, 0x34, 0xc8, 0x7d, 0xa8, 0xbf, 0x66, 0xb3, 0x97, 0x38, 0x66, 0xdf, 0xae, 0x81, 0x03, - 0xa1, 0x88, 0xa7, 0xf8, 0x24, 0x07, 0xd0, 0x64, 0x23, 0x1c, 0xb1, 0x71, 0x12, 0x4a, 0x1c, 0xbd, - 0xd7, 0x88, 0x74, 0x30, 0x6c, 0x90, 0x84, 0x52, 0xa5, 0xb5, 0x40, 0xa3, 0xc0, 0xaa, 0x45, 0x32, - 0x00, 0xe0, 0x42, 0x24, 0x42, 0x09, 0xae, 0xa0, 0xe0, 0x47, 0x57, 0x09, 0xf6, 0x8b, 0x28, 0xd4, - 0xc3, 0x01, 0x32, 0x27, 0x51, 0x8b, 0x97, 0x4b, 0xe4, 0x3b, 0x35, 0xb0, 0x1a, 0x28, 0xf3, 0xf1, - 0x55, 0x32, 0x87, 0x32, 0xde, 0xe5, 0x22, 0x8d, 0x4e, 0xa3, 0x11, 0x4b, 0xb9, 0xbc, 0x30, 0xaf, - 0x7e, 0x84, 0xd5, 0x20, 0x12, 0x7c, 0x94, 0x26, 0xe2, 0x95, 0x3f, 0x66, 0x53, 0xc7, 0x44, 0xa5, - 0xf6, 0x55, 0x4a, 0xbd, 0x32, 0xf0, 0x09, 0x9b, 0x76, 0x6f, 0xe6, 0x99, 0x7b, 0x9e, 0x4a, 0x5b, - 0xc1, 0x42, 0x80, 0x77, 0x0c, 0xd0, 0x39, 0x97, 0xf5, 0xbc, 0x20, 0x8e, 0xd1, 0xae, 0x5d, 0x97, - 0x75, 0xc5, 0x51, 0x59, 0xcf, 0x49, 0xd4, 0xaa, 0x8a, 0xe8, 0xfd, 0x6a, 0x80, 0x55, 0x05, 0x92, - 0x5b, 0x50, 0x9f, 0xb0, 0x31, 0xd7, 0xd7, 0x1a, 0x4f, 0xb0, 0xf0, 0x29, 0x3e, 0x89, 0x07, 0x2b, - 0xa7, 0x89, 0x18, 0xb3, 0x54, 0x8f, 0x3a, 0x6c, 0x61, 0x85, 0x50, 0xfd, 0x4b, 0xee, 0x42, 0x73, - 0xca, 0xc5, 0x38, 0x92, 0xc5, 0xa7, 0x5c, 0xea, 0xdb, 0x88, 0xa7, 0xb8, 0x00, 0xd3, 0x45, 0x87, - 0x6c, 0x82, 0x29, 0xb8, 0xfa, 0x7e, 0x61, 0x6b, 0x99, 0x6a, 0x9e, 0x94, 0x18, 0xad, 0x2c, 0xef, - 0x08, 0xac, 0xea, 0x28, 0xc9, 0x23, 0xb0, 0xaa, 0x83, 0xd4, 0x65, 0xb8, 0xf5, 0x5f, 0x87, 0xaf, - 0xfe, 0x44, 0x54, 0x14, 0x6a, 0x96, 0x47, 0xef, 0xfd, 0x66, 0x80, 0x59, 0x46, 0xbd, 0xa5, 0x04, - 0x77, 0xc0, 0x8a, 0x93, 0xd0, 0x8f, 0xf9, 0x0b, 0x1e, 0xeb, 0x2a, 0xa0, 0x6c, 0x05, 0x52, 0x33, - 0x4e, 0xc2, 0x41, 0x61, 0xfd, 0xaf, 0xa5, 0xb8, 0x73, 0xac, 0xbf, 0x59, 0x8b, 0x33, 0xe5, 0xfc, - 0x04, 0xb3, 0x60, 0xb9, 0x73, 0x70, 0x30, 0xf8, 0xc9, 0x36, 0x88, 0x09, 0xf5, 0x61, 0xff, 0x70, - 0x68, 0x2f, 0x15, 0xa3, 0x8c, 0x3e, 0x1d, 0x0c, 0xba, 0x9d, 0xdd, 0xc7, 0x76, 0xad, 0x18, 0x72, - 0xb4, 0x3f, 0x3c, 0xa2, 0xfb, 0x76, 0xbd, 0x08, 0x7f, 0xf8, 0x94, 0xee, 0xf6, 0xed, 0xe5, 0xee, - 0xd7, 0x7f, 0xbc, 0xd9, 0x30, 0xfe, 0x7a, 0xb3, 0x61, 0xfc, 0xfd, 0x66, 0xc3, 0x38, 0xfe, 0x2c, - 0x8c, 0xd2, 0xb3, 0xd9, 0xc9, 0xd6, 0x28, 0x19, 0x6f, 0x63, 0x6d, 0xb7, 0xb1, 0xb6, 0xdb, 0x32, - 0x78, 0xbe, 0xfd, 0x62, 0x67, 0x1b, 0xff, 0x14, 0x7e, 0x8b, 0xcf, 0x93, 0x15, 0xfc, 0xb9, 0xf7, - 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x80, 0x5c, 0xfb, 0x6c, 0x0a, 0x00, 0x00, + 0x17, 0x0d, 0x6d, 0xd9, 0x22, 0xaf, 0x64, 0x99, 0x99, 0xef, 0x2b, 0x40, 0x14, 0xa9, 0x29, 0xb0, + 0x0d, 0xea, 0xa6, 0xa8, 0x8d, 0x38, 0x2d, 0x8a, 0x22, 0x41, 0x03, 0xc9, 0x52, 0x1a, 0x23, 0x8a, + 0x63, 0x8c, 0xe5, 0xb4, 0xf5, 0x86, 0x1d, 0x8b, 0x63, 0x9a, 0x08, 0x25, 0x0a, 0x33, 0x54, 0x90, + 0xe4, 0x19, 0xf2, 0x24, 0xdd, 0x75, 0xd9, 0x37, 0xe8, 0xb2, 0x4f, 0x40, 0x14, 0x59, 0x72, 0xd3, + 0x57, 0x28, 0x78, 0x67, 0x48, 0xc9, 0x7f, 0x4d, 0x36, 0xdd, 0x90, 0x77, 0xce, 0xdc, 0x7b, 0xc8, + 0xb9, 0x3f, 0x87, 0x84, 0xc6, 0x24, 0x8c, 0x26, 0xaf, 0xb6, 0xa6, 0x22, 0x49, 0x13, 0x42, 0x4e, + 0xbf, 0xd9, 0x52, 0x6b, 0x16, 0xf2, 0x49, 0xba, 0x25, 0x83, 0x17, 0x1f, 0x37, 0x47, 0xc9, 0x78, + 0x9c, 0x4c, 0x94, 0x47, 0xb1, 0x9a, 0x9c, 0x46, 0xa1, 0x5e, 0x41, 0x98, 0x84, 0x89, 0xb2, 0xbd, + 0xb7, 0xab, 0xd0, 0xdc, 0x2f, 0x62, 0x7b, 0x3c, 0x65, 0x51, 0x2c, 0xc9, 0xe7, 0x60, 0x22, 0x97, + 0x1f, 0x05, 0x8e, 0xd1, 0x36, 0x36, 0xad, 0x6e, 0x33, 0xcf, 0xdc, 0x0a, 0xa3, 0x75, 0xb4, 0xf6, + 0x02, 0x72, 0x1b, 0xea, 0x2f, 0xb9, 0x90, 0x51, 0x32, 0x71, 0x96, 0xd0, 0xaf, 0x91, 0x67, 0x6e, + 0x09, 0xd1, 0xd2, 0x20, 0x77, 0xc0, 0x2a, 0x1e, 0xee, 0x4f, 0x59, 0x7a, 0xe6, 0x2c, 0xa3, 0xe3, + 0x5a, 0x9e, 0xb9, 0x73, 0x90, 0x9a, 0x85, 0x79, 0xc0, 0xd2, 0x33, 0xf2, 0x15, 0xc0, 0x54, 0x24, + 0x23, 0x2e, 0x65, 0xf1, 0xf4, 0x1a, 0x3a, 0xb7, 0xf2, 0xcc, 0x5d, 0x40, 0xa9, 0xa5, 0xed, 0xbd, + 0x80, 0xdc, 0x83, 0x66, 0xb9, 0x81, 0xec, 0x2b, 0x18, 0x60, 0xe7, 0x99, 0x7b, 0x0e, 0xa7, 0x0d, + 0xbd, 0x2a, 0x9f, 0x21, 0x53, 0x26, 0x52, 0x3f, 0x8d, 0xc6, 0xdc, 0x59, 0x6d, 0x1b, 0x9b, 0xcb, + 0xea, 0x19, 0x73, 0x94, 0x5a, 0x68, 0x0f, 0xa3, 0x31, 0x27, 0x1d, 0xb8, 0x79, 0x32, 0x8b, 0xe2, + 0xd4, 0x3f, 0x15, 0xc9, 0xd8, 0x97, 0xc9, 0x4c, 0x8c, 0xb8, 0x53, 0x6f, 0x1b, 0x9b, 0x66, 0xf7, + 0xa3, 0x3c, 0x73, 0x2f, 0x6f, 0xd2, 0x75, 0x84, 0x1e, 0x89, 0x64, 0x7c, 0x88, 0x00, 0x79, 0x08, + 0x76, 0x9c, 0xb0, 0x80, 0x9d, 0xc4, 0xdc, 0x1f, 0x27, 0xc1, 0x2c, 0xe6, 0xd2, 0x31, 0xdb, 0xcb, + 0x9b, 0x56, 0xf7, 0xff, 0x79, 0xe6, 0x5e, 0xda, 0xa3, 0xeb, 0x25, 0xf2, 0x54, 0x01, 0xe4, 0x01, + 0xac, 0x8b, 0xd9, 0xa4, 0x78, 0xb3, 0x2a, 0xde, 0xc2, 0xf8, 0xff, 0xe5, 0x99, 0x7b, 0x71, 0x8b, + 0xb6, 0x34, 0x50, 0x46, 0xef, 0x42, 0x6d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb1, 0x73, + 0x7b, 0xeb, 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x94, 0xa7, 0xac, 0xc7, 0x52, + 0xd6, 0x35, 0xf3, 0xcc, 0xc5, 0x30, 0x8a, 0x57, 0xf2, 0x10, 0x96, 0xa5, 0x8c, 0x9d, 0x06, 0x72, + 0x7c, 0x76, 0x2d, 0xc7, 0xa1, 0x8c, 0x2b, 0x8a, 0x7a, 0x9e, 0xb9, 0x45, 0x10, 0x2d, 0x2e, 0x3a, + 0xed, 0xe9, 0x4c, 0xfa, 0x33, 0x11, 0x3b, 0xcd, 0x79, 0x69, 0xe7, 0x28, 0xa6, 0x3d, 0x9d, 0xc9, + 0x23, 0x11, 0x93, 0xef, 0xa0, 0xa5, 0x5a, 0x76, 0x26, 0xb8, 0xcf, 0x44, 0x28, 0x9d, 0x35, 0x3c, + 0x31, 0xc9, 0x33, 0xf7, 0xc2, 0x0e, 0x5d, 0xab, 0xd6, 0x1d, 0x11, 0x4a, 0x72, 0x1f, 0xd6, 0xb9, + 0x10, 0x89, 0xf0, 0xe3, 0x24, 0xc4, 0xfa, 0x4b, 0xa7, 0x35, 0xcf, 0xd6, 0x85, 0x2d, 0xba, 0x86, + 0xc0, 0x20, 0x09, 0x8b, 0xe6, 0x90, 0x1e, 0x83, 0x9b, 0x97, 0x92, 0x51, 0x74, 0x3a, 0x9f, 0x14, + 0x05, 0x51, 0x13, 0x61, 0xaa, 0x4e, 0xd7, 0x10, 0x2d, 0x8d, 0xc2, 0x4d, 0xf0, 0x98, 0x33, 0xc9, + 0x17, 0x07, 0x42, 0x43, 0xb4, 0x34, 0xbc, 0xdf, 0x0d, 0xb0, 0x2f, 0x26, 0x8b, 0x1c, 0x83, 0x29, + 0x65, 0xec, 0xa7, 0xaf, 0xa7, 0x1c, 0x9f, 0xd1, 0xda, 0xb9, 0xfb, 0x21, 0x49, 0xae, 0x80, 0xe1, + 0xeb, 0x29, 0x57, 0x83, 0x5a, 0xd2, 0xd0, 0xba, 0x54, 0x70, 0xf1, 0x5e, 0x81, 0x1a, 0x6e, 0x67, + 0x09, 0x13, 0x81, 0xef, 0xa5, 0x21, 0x5a, 0x1a, 0x9e, 0xa7, 0x85, 0x40, 0xb3, 0x11, 0x0b, 0x56, + 0xba, 0x47, 0x7b, 0x83, 0xa1, 0x7d, 0x83, 0xd4, 0x61, 0x99, 0x1e, 0xed, 0xdb, 0x86, 0xf7, 0x76, + 0x09, 0x1a, 0xe8, 0xf4, 0x98, 0xb3, 0x38, 0x3d, 0xfb, 0x70, 0xb1, 0xf8, 0x05, 0x9a, 0x0a, 0x54, + 0x25, 0xc6, 0x04, 0xb5, 0x76, 0xbe, 0xbc, 0xf6, 0x8c, 0x8a, 0x5f, 0x1f, 0x0f, 0x43, 0xd4, 0x5c, + 0x2f, 0x92, 0x50, 0x25, 0x82, 0x6a, 0xbb, 0x18, 0x92, 0x80, 0x87, 0x82, 0x05, 0x3c, 0xf0, 0x05, + 0x67, 0x32, 0x99, 0x68, 0xb5, 0xc1, 0xb2, 0x5f, 0xd8, 0xa2, 0xad, 0x12, 0xa0, 0xb8, 0xf6, 0xbe, + 0xd6, 0xe7, 0xd2, 0x64, 0x0d, 0xa8, 0x1f, 0xed, 0x3f, 0xd9, 0x7f, 0xf6, 0xe3, 0xbe, 0x7d, 0x83, + 0x00, 0xac, 0x76, 0x76, 0x87, 0x7b, 0xcf, 0xfb, 0xb6, 0x41, 0x9a, 0x60, 0xf6, 0xfa, 0x3f, 0xd0, + 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0xbf, 0x6b, 0x3a, 0x6c, 0x17, 0x3b, 0x90, 0xec, 0xc1, 0x2a, + 0x1b, 0xa5, 0x85, 0x22, 0xaa, 0x1a, 0x5e, 0x3f, 0x6c, 0x2a, 0xa0, 0x83, 0xce, 0x5d, 0xc8, 0x33, + 0x57, 0x07, 0x52, 0x7d, 0x27, 0xcf, 0xa1, 0xa1, 0xda, 0xda, 0x0f, 0x58, 0xca, 0x30, 0x5f, 0xd7, + 0x0c, 0x9e, 0xa2, 0xea, 0x71, 0x39, 0x12, 0xd1, 0x34, 0x4d, 0x44, 0x77, 0x3d, 0xcf, 0xdc, 0xc5, + 0x60, 0x0a, 0x6a, 0x81, 0x8d, 0xd6, 0x87, 0xfa, 0x1b, 0xb5, 0xc4, 0xf4, 0x34, 0x76, 0x36, 0xae, + 0xe2, 0x3c, 0x8e, 0xa6, 0x53, 0x1e, 0x3c, 0x8a, 0x62, 0xae, 0x9a, 0x45, 0x87, 0xd0, 0xd2, 0x20, + 0x0f, 0xa0, 0xf6, 0x86, 0xcd, 0x5e, 0xa1, 0x46, 0xbf, 0x9f, 0x03, 0xd5, 0xa4, 0xf0, 0xa7, 0x78, + 0x25, 0x07, 0xd0, 0x60, 0x23, 0xd4, 0xe7, 0x38, 0x09, 0x25, 0xea, 0xf6, 0x35, 0x24, 0x1d, 0x74, + 0x1b, 0x24, 0xa1, 0x54, 0xc7, 0x5a, 0x08, 0xa3, 0xc0, 0xaa, 0x4d, 0x32, 0x00, 0xa8, 0x26, 0x5b, + 0xa2, 0xaa, 0x37, 0x76, 0x3e, 0xb9, 0x8a, 0xb0, 0xaf, 0xc7, 0x5d, 0x2a, 0xf5, 0x99, 0x07, 0x51, + 0xab, 0x54, 0x02, 0x49, 0xbe, 0x57, 0x6a, 0x57, 0x47, 0x9a, 0x4f, 0xaf, 0xa2, 0x39, 0x94, 0xf1, + 0x2e, 0x17, 0x69, 0x74, 0x1a, 0x8d, 0x58, 0xca, 0xe5, 0x05, 0xb1, 0xfb, 0x09, 0xd6, 0x82, 0x48, + 0xf0, 0x51, 0x9a, 0x88, 0xd7, 0xfe, 0x98, 0x4d, 0x1d, 0x13, 0x99, 0xda, 0x57, 0x31, 0xf5, 0x4a, + 0xc7, 0xa7, 0x6c, 0xda, 0xbd, 0x99, 0x67, 0xee, 0xf9, 0x50, 0xda, 0x0c, 0x16, 0x1c, 0xbc, 0x63, + 0x80, 0xce, 0xb9, 0x53, 0xcf, 0x13, 0xe2, 0x18, 0xed, 0xe5, 0xeb, 0x4e, 0x5d, 0xc5, 0xa8, 0x53, + 0xcf, 0x83, 0xa8, 0x55, 0x25, 0xd1, 0xfb, 0xd5, 0x00, 0xab, 0x72, 0x24, 0xb7, 0xa0, 0x36, 0x61, + 0x63, 0xae, 0xc7, 0x1a, 0x2b, 0x58, 0xac, 0x29, 0x5e, 0x89, 0x07, 0xab, 0xa7, 0x89, 0x18, 0xb3, + 0x54, 0x4b, 0x1d, 0xb6, 0xb0, 0x42, 0xa8, 0xbe, 0x93, 0xbb, 0xd0, 0x98, 0x72, 0x31, 0x8e, 0x64, + 0xf1, 0x1f, 0x20, 0xf5, 0x34, 0x62, 0x15, 0x17, 0x60, 0xba, 0xb8, 0x20, 0x9b, 0x60, 0x0a, 0xae, + 0x3e, 0x7e, 0xd8, 0x5a, 0xa6, 0xd2, 0x93, 0x12, 0xa3, 0x95, 0xe5, 0x1d, 0x81, 0x55, 0x95, 0x92, + 0x3c, 0x06, 0xab, 0x2a, 0xa4, 0x4e, 0xc3, 0xad, 0x7f, 0x2b, 0xbe, 0xfa, 0x03, 0xa9, 0x42, 0xa8, + 0x59, 0x96, 0xde, 0xfb, 0xcd, 0x00, 0xb3, 0xf4, 0x7a, 0x4f, 0x0a, 0xee, 0x80, 0x55, 0x7c, 0x46, + 0x62, 0xfe, 0x92, 0xc7, 0x3a, 0x0b, 0x48, 0x5b, 0x81, 0xd4, 0x8c, 0x93, 0x70, 0x50, 0x58, 0xff, + 0x69, 0x2a, 0xee, 0x1c, 0xeb, 0x6f, 0xd6, 0xa2, 0xa6, 0x9c, 0x57, 0x30, 0x0b, 0x56, 0x3a, 0x07, + 0x07, 0x83, 0x9f, 0x6d, 0x83, 0x98, 0x50, 0x1b, 0xf6, 0x0f, 0x87, 0xf6, 0x52, 0x21, 0x65, 0xf4, + 0xd9, 0x60, 0xd0, 0xed, 0xec, 0x3e, 0xb1, 0x97, 0x0b, 0x91, 0xa3, 0xfd, 0xe1, 0x11, 0xdd, 0xb7, + 0x6b, 0x85, 0xfb, 0xa3, 0x67, 0x74, 0xb7, 0x6f, 0xaf, 0x74, 0xbf, 0xfd, 0xe3, 0xdd, 0x86, 0xf1, + 0xe7, 0xbb, 0x0d, 0xe3, 0xaf, 0x77, 0x1b, 0xc6, 0xf1, 0x17, 0x61, 0x94, 0x9e, 0xcd, 0x4e, 0xb6, + 0x46, 0xc9, 0x78, 0x1b, 0x73, 0xbb, 0x8d, 0xb9, 0xdd, 0x96, 0xc1, 0x8b, 0xed, 0x97, 0x3b, 0xdb, + 0xf8, 0x47, 0x79, 0x1f, 0xaf, 0x27, 0xab, 0x78, 0xbb, 0xf7, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x72, 0x41, 0x36, 0xe8, 0xa9, 0x0a, 0x00, 0x00, } func (m *NginxDetails) Marshal() (dAtA []byte, err error) { @@ -965,6 +977,15 @@ func (m *NginxDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.ErrorLogPaths) > 0 { + for iNdEx := len(m.ErrorLogPaths) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.ErrorLogPaths[iNdEx]) + copy(dAtA[i:], m.ErrorLogPaths[iNdEx]) + i = encodeVarintNginx(dAtA, i, uint64(len(m.ErrorLogPaths[iNdEx]))) + i-- + dAtA[i] = 0x72 + } + } if len(m.ConfigureArgs) > 0 { for iNdEx := len(m.ConfigureArgs) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.ConfigureArgs[iNdEx]) @@ -1594,6 +1615,12 @@ func (m *NginxDetails) Size() (n int) { n += 1 + l + sovNginx(uint64(l)) } } + if len(m.ErrorLogPaths) > 0 { + for _, s := range m.ErrorLogPaths { + l = len(s) + n += 1 + l + sovNginx(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2230,6 +2257,38 @@ func (m *NginxDetails) Unmarshal(dAtA []byte) error { } m.ConfigureArgs = append(m.ConfigureArgs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrorLogPaths", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNginx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNginx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNginx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ErrorLogPaths = append(m.ErrorLogPaths, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipNginx(dAtA[iNdEx:]) diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto index 7ac92921b4..e458b7a73a 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto @@ -47,6 +47,9 @@ message NginxDetails { // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] repeated string configure_args = 13 [(gogoproto.jsontag) = "configure_args"]; + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + repeated string error_log_paths = 14 [(gogoproto.jsontag) = "error_log_paths"]; } // swagger:model NginxPlusMetaData diff --git a/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go b/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go index d9853555b2..577abc6c05 100644 --- a/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go +++ b/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go @@ -47,7 +47,7 @@ type NginxBinary interface { Start(nginxId, bin string) error Stop(processId, bin string) error Reload(processId, bin string) error - ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error + ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error GetNginxDetailsFromProcess(nginxProcess *Process) *proto.NginxDetails GetNginxDetailsByID(nginxID string) *proto.NginxDetails GetNginxIDForProcess(nginxProcess *Process) string @@ -209,6 +209,10 @@ func (n *NginxBinaryType) GetNginxDetailsFromProcess(nginxProcess *Process) *pro log.Tracef("Custom conf path set: %v", path) nginxDetailsFacade.ConfPath = path } + if errorLogPaths := getErrorLogPathFromCommand(nginxProcess.Command); len(errorLogPaths) > 0 { + log.Tracef("Custom error log paths set: %v", errorLogPaths) + nginxDetailsFacade.ErrorLogPaths = errorLogPaths + } n.statusUrlMutex.RLock() urlsLength := len(n.statusUrls) @@ -290,15 +294,25 @@ func (n *NginxBinaryType) Reload(processId, bin string) error { } // ValidateConfig tests the config with nginx -t -c configLocation. -func (n *NginxBinaryType) ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { - log.Debugf("Validating config, %s for nginx process, %s", configLocation, processId) - response, err := runCmd(bin, "-t", "-c", configLocation) +func (n *NginxBinaryType) ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { + log.Debugf("Validating config, %s for nginx process, %s, with custom error path %v", configLocation, processId, errorLogPaths) + cmdArgs := make([]string, 0) + cmdArgs = append(cmdArgs, "-t") + if len(configLocation) > 0 { + cmdArgs = append(cmdArgs, "-c") + cmdArgs = append(cmdArgs, configLocation) + } + for _, path := range errorLogPaths { + cmdArgs = append(cmdArgs, "-e") + cmdArgs = append(cmdArgs, path) + } + response, err := runCmd(bin, cmdArgs...) if err != nil { confFiles, auxFiles, getNginxConfigFilesErr := sdk.GetNginxConfigFiles(config) if getNginxConfigFilesErr == nil { n.writeBackup(config, confFiles, auxFiles) } - return fmt.Errorf("error running nginx -t -c %v:\n%s", configLocation, response) + return fmt.Errorf("error running nginx %v:\n%s", strings.Join(cmdArgs, " "), response) } err = n.validateConfigCheckResponse(response, configLocation) @@ -753,6 +767,20 @@ func getConfPathFromCommand(command string) string { return "" } +func getErrorLogPathFromCommand(command string) []string { + commands := strings.Split(command, " ") + errorPath := make([]string, 0) + + for i, command := range commands { + if command == "-e" { + if i < len(commands)-1 { + errorPath = append(errorPath, commands[i+1]) + } + } + } + return errorPath +} + func parseConfigureArguments(line string) (result map[string]interface{}, flags []string) { // need to check for empty strings flags = strings.Split(line[len("configure arguments:"):], " --") diff --git a/test/integration/vendor/github.com/nginx/agent/v2/test/utils/nginx.go b/test/integration/vendor/github.com/nginx/agent/v2/test/utils/nginx.go index 53b2a9779b..dfb498adf5 100644 --- a/test/integration/vendor/github.com/nginx/agent/v2/test/utils/nginx.go +++ b/test/integration/vendor/github.com/nginx/agent/v2/test/utils/nginx.go @@ -109,8 +109,8 @@ func (m *MockNginxBinary) Reload(processId, bin string) error { return nil } -func (m *MockNginxBinary) ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { - args := m.Called(processId, bin, configLocation, config, configApply) +func (m *MockNginxBinary) ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { + args := m.Called(processId, bin, configLocation, errorLogPaths, config, configApply) return args.Error(0) } diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go index d3d3ea688b..07f77032ef 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go @@ -166,7 +166,10 @@ type NginxDetails struct { StatusUrl string `protobuf:"bytes,12,opt,name=status_url,json=statusUrl,proto3" json:"status_url"` // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] - ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + ErrorLogPaths []string `protobuf:"bytes,14,rep,name=error_log_paths,json=errorLogPaths,proto3" json:"error_log_paths"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -296,6 +299,13 @@ func (m *NginxDetails) GetConfigureArgs() []string { return nil } +func (m *NginxDetails) GetErrorLogPaths() []string { + if m != nil { + return m.ErrorLogPaths + } + return nil +} + // swagger:model NginxPlusMetaData // Represents NGINX Plus metadata type NginxPlusMetaData struct { @@ -865,80 +875,82 @@ func init() { func init() { proto.RegisterFile("nginx.proto", fileDescriptor_917f1a70b1fd7255) } var fileDescriptor_917f1a70b1fd7255 = []byte{ - // 1166 bytes of a gzipped FileDescriptorProto + // 1192 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x0e, 0x2d, 0xd9, 0x22, 0x47, 0xb2, 0xcd, 0x6c, 0x5b, 0x80, 0x28, 0x52, 0x53, 0x60, 0x1b, - 0xd4, 0x4d, 0x51, 0x1b, 0x71, 0x5a, 0x14, 0x45, 0x83, 0x06, 0x92, 0xa5, 0x34, 0x46, 0x14, 0xc7, - 0x58, 0xcb, 0x69, 0xeb, 0x0b, 0xbb, 0x16, 0xd7, 0x34, 0x11, 0x4a, 0x14, 0x76, 0xa9, 0x20, 0xc9, - 0x33, 0xf4, 0x49, 0x7a, 0xeb, 0xb1, 0x6f, 0xd0, 0x5b, 0xfb, 0x04, 0x44, 0x91, 0x23, 0x2f, 0x7d, - 0x85, 0x82, 0xb3, 0x4b, 0x4a, 0xfe, 0x6b, 0x72, 0xe9, 0x85, 0x9a, 0xf9, 0x76, 0xbe, 0x6f, 0x39, - 0xb3, 0xb3, 0x43, 0x41, 0x73, 0x12, 0x46, 0x93, 0x97, 0x5b, 0x53, 0x91, 0xa4, 0x09, 0x21, 0xa7, - 0x5f, 0x6d, 0x29, 0x9f, 0x85, 0x7c, 0x92, 0x6e, 0xc9, 0xe0, 0xf9, 0x87, 0xad, 0x51, 0x32, 0x1e, - 0x27, 0x13, 0x15, 0x51, 0x78, 0x93, 0xd3, 0x28, 0xd4, 0x1e, 0x84, 0x49, 0x98, 0x28, 0xdb, 0xfb, - 0x73, 0x19, 0x5a, 0xfb, 0x05, 0xb7, 0xc7, 0x53, 0x16, 0xc5, 0x92, 0x7c, 0x0a, 0x26, 0x6a, 0xf9, - 0x51, 0xe0, 0x18, 0x6d, 0x63, 0xd3, 0xea, 0xb6, 0xf2, 0xcc, 0xad, 0x30, 0xda, 0x40, 0x6b, 0x2f, - 0x20, 0xb7, 0xa1, 0xf1, 0x82, 0x0b, 0x19, 0x25, 0x13, 0x67, 0x09, 0xe3, 0x9a, 0x79, 0xe6, 0x96, - 0x10, 0x2d, 0x0d, 0x72, 0x07, 0xac, 0x62, 0x73, 0x7f, 0xca, 0xd2, 0x33, 0xa7, 0x86, 0x81, 0xab, - 0x79, 0xe6, 0xce, 0x41, 0x6a, 0x16, 0xe6, 0x01, 0x4b, 0xcf, 0xc8, 0x17, 0x00, 0x53, 0x91, 0x8c, - 0xb8, 0x94, 0xc5, 0xee, 0x75, 0x0c, 0x5e, 0xcb, 0x33, 0x77, 0x01, 0xa5, 0x96, 0xb6, 0xf7, 0x02, - 0x72, 0x0f, 0x5a, 0xe5, 0x02, 0xaa, 0x2f, 0x23, 0xc1, 0xce, 0x33, 0xf7, 0x1c, 0x4e, 0x9b, 0xda, - 0x2b, 0xf7, 0x90, 0x29, 0x13, 0xa9, 0x9f, 0x46, 0x63, 0xee, 0xac, 0xb4, 0x8d, 0xcd, 0x9a, 0xda, - 0x63, 0x8e, 0x52, 0x0b, 0xed, 0x61, 0x34, 0xe6, 0xa4, 0x03, 0x37, 0x4f, 0x66, 0x51, 0x9c, 0xfa, - 0xa7, 0x22, 0x19, 0xfb, 0x32, 0x99, 0x89, 0x11, 0x77, 0x1a, 0x6d, 0x63, 0xd3, 0xec, 0x7e, 0x90, - 0x67, 0xee, 0xe5, 0x45, 0xba, 0x8e, 0xd0, 0x43, 0x91, 0x8c, 0x0f, 0x11, 0x20, 0x0f, 0xc0, 0x8e, - 0x13, 0x16, 0xb0, 0x93, 0x98, 0xfb, 0xe3, 0x24, 0x98, 0xc5, 0x5c, 0x3a, 0x66, 0xbb, 0xb6, 0x69, - 0x75, 0xdf, 0xcf, 0x33, 0xf7, 0xd2, 0x1a, 0x5d, 0x2f, 0x91, 0x27, 0x0a, 0x20, 0xf7, 0x61, 0x5d, - 0xcc, 0x26, 0xc5, 0x9b, 0x55, 0x7c, 0x0b, 0xf9, 0xef, 0xe5, 0x99, 0x7b, 0x71, 0x89, 0xae, 0x69, - 0xa0, 0x64, 0xef, 0x42, 0x7d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb9, 0x73, 0x7b, 0xeb, - 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x84, 0xa7, 0xac, 0xc7, 0x52, 0xd6, 0x35, - 0xf3, 0xcc, 0x45, 0x1a, 0xc5, 0x27, 0x79, 0x00, 0x35, 0x29, 0x63, 0xa7, 0x89, 0x1a, 0x9f, 0x5c, - 0xab, 0x71, 0x28, 0xe3, 0x4a, 0xa2, 0x91, 0x67, 0x6e, 0x41, 0xa2, 0xc5, 0x43, 0x97, 0x3d, 0x9d, - 0x49, 0x7f, 0x26, 0x62, 0xa7, 0x35, 0x3f, 0xda, 0x39, 0x8a, 0x65, 0x4f, 0x67, 0xf2, 0x48, 0xc4, - 0xe4, 0x1b, 0x58, 0x53, 0x2d, 0x3b, 0x13, 0xdc, 0x67, 0x22, 0x94, 0xce, 0x2a, 0x66, 0x4c, 0xf2, - 0xcc, 0xbd, 0xb0, 0x42, 0x57, 0x2b, 0xbf, 0x23, 0x42, 0xe9, 0x31, 0xb8, 0x79, 0x29, 0x9f, 0xa2, - 0x59, 0xf9, 0xa4, 0xa8, 0xa9, 0x6a, 0x6a, 0x53, 0x35, 0xab, 0x86, 0x68, 0x69, 0x14, 0x61, 0x82, - 0xc7, 0x9c, 0x49, 0xbe, 0xd8, 0xd3, 0x1a, 0xa2, 0xa5, 0xe1, 0xfd, 0x6e, 0x80, 0x7d, 0x31, 0x5f, - 0x72, 0x0c, 0xa6, 0x94, 0xb1, 0x9f, 0xbe, 0x9a, 0x72, 0xdc, 0x63, 0x6d, 0xe7, 0xee, 0xbb, 0xd4, - 0xa9, 0x02, 0x86, 0xaf, 0xa6, 0x5c, 0xdd, 0xb5, 0x52, 0x86, 0x36, 0xa4, 0x82, 0x8b, 0xf7, 0x0a, - 0xd4, 0xfd, 0x74, 0x96, 0xb0, 0x0e, 0xf8, 0x5e, 0x1a, 0xa2, 0xa5, 0xe1, 0x79, 0xfa, 0x2e, 0x6b, - 0x35, 0x62, 0xc1, 0x72, 0xf7, 0x68, 0x6f, 0x30, 0xb4, 0x6f, 0x90, 0x06, 0xd4, 0xe8, 0xd1, 0xbe, - 0x6d, 0x78, 0xbf, 0x2c, 0x41, 0x13, 0x83, 0x1e, 0x71, 0x16, 0xa7, 0x67, 0xef, 0x7e, 0xdf, 0x7f, - 0x86, 0x96, 0x02, 0xd5, 0x29, 0x61, 0x81, 0xd6, 0x76, 0x3e, 0xbf, 0x36, 0x47, 0xa5, 0xaf, 0xd3, - 0x43, 0x8a, 0xba, 0x9a, 0x8b, 0x22, 0x54, 0xcd, 0x31, 0xb5, 0x5c, 0xf4, 0x79, 0xc0, 0x43, 0xc1, - 0x02, 0x1e, 0xf8, 0x82, 0x33, 0x99, 0x4c, 0xf4, 0xc0, 0xc0, 0x3e, 0xbf, 0xb0, 0x44, 0xd7, 0x4a, - 0x80, 0xa2, 0xef, 0x7d, 0xa9, 0xf3, 0xd2, 0x62, 0x4d, 0x68, 0x1c, 0xed, 0x3f, 0xde, 0x7f, 0xfa, - 0xc3, 0xbe, 0x7d, 0x83, 0x00, 0xac, 0x74, 0x76, 0x87, 0x7b, 0xcf, 0xfa, 0xb6, 0x41, 0x5a, 0x60, - 0xf6, 0xfa, 0xdf, 0xd3, 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0x7f, 0xea, 0x9a, 0xb6, 0x8b, 0x4d, - 0x44, 0xf6, 0x60, 0x85, 0x8d, 0xd2, 0x62, 0xa8, 0xa9, 0x33, 0xbc, 0xfe, 0xbe, 0x28, 0x42, 0x07, - 0x83, 0xbb, 0x90, 0x67, 0xae, 0x26, 0x52, 0xfd, 0x4b, 0x9e, 0x41, 0x53, 0x75, 0xa6, 0x1f, 0xb0, - 0x94, 0x61, 0xbd, 0xae, 0xb9, 0x3b, 0x4a, 0xaa, 0xc7, 0xe5, 0x48, 0x44, 0xd3, 0x34, 0x11, 0xdd, - 0xf5, 0x3c, 0x73, 0x17, 0xc9, 0x14, 0x94, 0x83, 0x8d, 0xd6, 0x87, 0xc6, 0x6b, 0xe5, 0x62, 0x79, - 0x9a, 0x3b, 0x1b, 0x57, 0x69, 0x1e, 0x47, 0xd3, 0x29, 0x0f, 0x1e, 0x46, 0x31, 0x57, 0xcd, 0xa2, - 0x29, 0xb4, 0x34, 0xc8, 0x7d, 0xa8, 0xbf, 0x66, 0xb3, 0x97, 0x38, 0x66, 0xdf, 0xae, 0x81, 0x03, - 0xa1, 0x88, 0xa7, 0xf8, 0x24, 0x07, 0xd0, 0x64, 0x23, 0x1c, 0xb1, 0x71, 0x12, 0x4a, 0x1c, 0xbd, - 0xd7, 0x88, 0x74, 0x30, 0x6c, 0x90, 0x84, 0x52, 0xa5, 0xb5, 0x40, 0xa3, 0xc0, 0xaa, 0x45, 0x32, - 0x00, 0xe0, 0x42, 0x24, 0x42, 0x09, 0xae, 0xa0, 0xe0, 0x47, 0x57, 0x09, 0xf6, 0x8b, 0x28, 0xd4, - 0xc3, 0x01, 0x32, 0x27, 0x51, 0x8b, 0x97, 0x4b, 0xe4, 0x3b, 0x35, 0xb0, 0x1a, 0x28, 0xf3, 0xf1, - 0x55, 0x32, 0x87, 0x32, 0xde, 0xe5, 0x22, 0x8d, 0x4e, 0xa3, 0x11, 0x4b, 0xb9, 0xbc, 0x30, 0xaf, - 0x7e, 0x84, 0xd5, 0x20, 0x12, 0x7c, 0x94, 0x26, 0xe2, 0x95, 0x3f, 0x66, 0x53, 0xc7, 0x44, 0xa5, - 0xf6, 0x55, 0x4a, 0xbd, 0x32, 0xf0, 0x09, 0x9b, 0x76, 0x6f, 0xe6, 0x99, 0x7b, 0x9e, 0x4a, 0x5b, - 0xc1, 0x42, 0x80, 0x77, 0x0c, 0xd0, 0x39, 0x97, 0xf5, 0xbc, 0x20, 0x8e, 0xd1, 0xae, 0x5d, 0x97, - 0x75, 0xc5, 0x51, 0x59, 0xcf, 0x49, 0xd4, 0xaa, 0x8a, 0xe8, 0xfd, 0x6a, 0x80, 0x55, 0x05, 0x92, - 0x5b, 0x50, 0x9f, 0xb0, 0x31, 0xd7, 0xd7, 0x1a, 0x4f, 0xb0, 0xf0, 0x29, 0x3e, 0x89, 0x07, 0x2b, - 0xa7, 0x89, 0x18, 0xb3, 0x54, 0x8f, 0x3a, 0x6c, 0x61, 0x85, 0x50, 0xfd, 0x4b, 0xee, 0x42, 0x73, - 0xca, 0xc5, 0x38, 0x92, 0xc5, 0xa7, 0x5c, 0xea, 0xdb, 0x88, 0xa7, 0xb8, 0x00, 0xd3, 0x45, 0x87, - 0x6c, 0x82, 0x29, 0xb8, 0xfa, 0x7e, 0x61, 0x6b, 0x99, 0x6a, 0x9e, 0x94, 0x18, 0xad, 0x2c, 0xef, - 0x08, 0xac, 0xea, 0x28, 0xc9, 0x23, 0xb0, 0xaa, 0x83, 0xd4, 0x65, 0xb8, 0xf5, 0x5f, 0x87, 0xaf, - 0xfe, 0x44, 0x54, 0x14, 0x6a, 0x96, 0x47, 0xef, 0xfd, 0x66, 0x80, 0x59, 0x46, 0xbd, 0xa5, 0x04, - 0x77, 0xc0, 0x8a, 0x93, 0xd0, 0x8f, 0xf9, 0x0b, 0x1e, 0xeb, 0x2a, 0xa0, 0x6c, 0x05, 0x52, 0x33, - 0x4e, 0xc2, 0x41, 0x61, 0xfd, 0xaf, 0xa5, 0xb8, 0x73, 0xac, 0xbf, 0x59, 0x8b, 0x33, 0xe5, 0xfc, - 0x04, 0xb3, 0x60, 0xb9, 0x73, 0x70, 0x30, 0xf8, 0xc9, 0x36, 0x88, 0x09, 0xf5, 0x61, 0xff, 0x70, - 0x68, 0x2f, 0x15, 0xa3, 0x8c, 0x3e, 0x1d, 0x0c, 0xba, 0x9d, 0xdd, 0xc7, 0x76, 0xad, 0x18, 0x72, - 0xb4, 0x3f, 0x3c, 0xa2, 0xfb, 0x76, 0xbd, 0x08, 0x7f, 0xf8, 0x94, 0xee, 0xf6, 0xed, 0xe5, 0xee, - 0xd7, 0x7f, 0xbc, 0xd9, 0x30, 0xfe, 0x7a, 0xb3, 0x61, 0xfc, 0xfd, 0x66, 0xc3, 0x38, 0xfe, 0x2c, - 0x8c, 0xd2, 0xb3, 0xd9, 0xc9, 0xd6, 0x28, 0x19, 0x6f, 0x63, 0x6d, 0xb7, 0xb1, 0xb6, 0xdb, 0x32, - 0x78, 0xbe, 0xfd, 0x62, 0x67, 0x1b, 0xff, 0x14, 0x7e, 0x8b, 0xcf, 0x93, 0x15, 0xfc, 0xb9, 0xf7, - 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x80, 0x5c, 0xfb, 0x6c, 0x0a, 0x00, 0x00, + 0x17, 0x0d, 0x6d, 0xd9, 0x22, 0xaf, 0x64, 0x99, 0x99, 0xef, 0x2b, 0x40, 0x14, 0xa9, 0x29, 0xb0, + 0x0d, 0xea, 0xa6, 0xa8, 0x8d, 0x38, 0x2d, 0x8a, 0x22, 0x41, 0x03, 0xc9, 0x52, 0x1a, 0x23, 0x8a, + 0x63, 0x8c, 0xe5, 0xb4, 0xf5, 0x86, 0x1d, 0x8b, 0x63, 0x9a, 0x08, 0x25, 0x0a, 0x33, 0x54, 0x90, + 0xe4, 0x19, 0xf2, 0x24, 0xdd, 0x75, 0xd9, 0x37, 0xe8, 0xb2, 0x4f, 0x40, 0x14, 0x59, 0x72, 0xd3, + 0x57, 0x28, 0x78, 0x67, 0x48, 0xc9, 0x7f, 0x4d, 0x36, 0xdd, 0x90, 0x77, 0xce, 0xdc, 0x7b, 0xc8, + 0xb9, 0x3f, 0x87, 0x84, 0xc6, 0x24, 0x8c, 0x26, 0xaf, 0xb6, 0xa6, 0x22, 0x49, 0x13, 0x42, 0x4e, + 0xbf, 0xd9, 0x52, 0x6b, 0x16, 0xf2, 0x49, 0xba, 0x25, 0x83, 0x17, 0x1f, 0x37, 0x47, 0xc9, 0x78, + 0x9c, 0x4c, 0x94, 0x47, 0xb1, 0x9a, 0x9c, 0x46, 0xa1, 0x5e, 0x41, 0x98, 0x84, 0x89, 0xb2, 0xbd, + 0xb7, 0xab, 0xd0, 0xdc, 0x2f, 0x62, 0x7b, 0x3c, 0x65, 0x51, 0x2c, 0xc9, 0xe7, 0x60, 0x22, 0x97, + 0x1f, 0x05, 0x8e, 0xd1, 0x36, 0x36, 0xad, 0x6e, 0x33, 0xcf, 0xdc, 0x0a, 0xa3, 0x75, 0xb4, 0xf6, + 0x02, 0x72, 0x1b, 0xea, 0x2f, 0xb9, 0x90, 0x51, 0x32, 0x71, 0x96, 0xd0, 0xaf, 0x91, 0x67, 0x6e, + 0x09, 0xd1, 0xd2, 0x20, 0x77, 0xc0, 0x2a, 0x1e, 0xee, 0x4f, 0x59, 0x7a, 0xe6, 0x2c, 0xa3, 0xe3, + 0x5a, 0x9e, 0xb9, 0x73, 0x90, 0x9a, 0x85, 0x79, 0xc0, 0xd2, 0x33, 0xf2, 0x15, 0xc0, 0x54, 0x24, + 0x23, 0x2e, 0x65, 0xf1, 0xf4, 0x1a, 0x3a, 0xb7, 0xf2, 0xcc, 0x5d, 0x40, 0xa9, 0xa5, 0xed, 0xbd, + 0x80, 0xdc, 0x83, 0x66, 0xb9, 0x81, 0xec, 0x2b, 0x18, 0x60, 0xe7, 0x99, 0x7b, 0x0e, 0xa7, 0x0d, + 0xbd, 0x2a, 0x9f, 0x21, 0x53, 0x26, 0x52, 0x3f, 0x8d, 0xc6, 0xdc, 0x59, 0x6d, 0x1b, 0x9b, 0xcb, + 0xea, 0x19, 0x73, 0x94, 0x5a, 0x68, 0x0f, 0xa3, 0x31, 0x27, 0x1d, 0xb8, 0x79, 0x32, 0x8b, 0xe2, + 0xd4, 0x3f, 0x15, 0xc9, 0xd8, 0x97, 0xc9, 0x4c, 0x8c, 0xb8, 0x53, 0x6f, 0x1b, 0x9b, 0x66, 0xf7, + 0xa3, 0x3c, 0x73, 0x2f, 0x6f, 0xd2, 0x75, 0x84, 0x1e, 0x89, 0x64, 0x7c, 0x88, 0x00, 0x79, 0x08, + 0x76, 0x9c, 0xb0, 0x80, 0x9d, 0xc4, 0xdc, 0x1f, 0x27, 0xc1, 0x2c, 0xe6, 0xd2, 0x31, 0xdb, 0xcb, + 0x9b, 0x56, 0xf7, 0xff, 0x79, 0xe6, 0x5e, 0xda, 0xa3, 0xeb, 0x25, 0xf2, 0x54, 0x01, 0xe4, 0x01, + 0xac, 0x8b, 0xd9, 0xa4, 0x78, 0xb3, 0x2a, 0xde, 0xc2, 0xf8, 0xff, 0xe5, 0x99, 0x7b, 0x71, 0x8b, + 0xb6, 0x34, 0x50, 0x46, 0xef, 0x42, 0x6d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb1, 0x73, + 0x7b, 0xeb, 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x94, 0xa7, 0xac, 0xc7, 0x52, + 0xd6, 0x35, 0xf3, 0xcc, 0xc5, 0x30, 0x8a, 0x57, 0xf2, 0x10, 0x96, 0xa5, 0x8c, 0x9d, 0x06, 0x72, + 0x7c, 0x76, 0x2d, 0xc7, 0xa1, 0x8c, 0x2b, 0x8a, 0x7a, 0x9e, 0xb9, 0x45, 0x10, 0x2d, 0x2e, 0x3a, + 0xed, 0xe9, 0x4c, 0xfa, 0x33, 0x11, 0x3b, 0xcd, 0x79, 0x69, 0xe7, 0x28, 0xa6, 0x3d, 0x9d, 0xc9, + 0x23, 0x11, 0x93, 0xef, 0xa0, 0xa5, 0x5a, 0x76, 0x26, 0xb8, 0xcf, 0x44, 0x28, 0x9d, 0x35, 0x3c, + 0x31, 0xc9, 0x33, 0xf7, 0xc2, 0x0e, 0x5d, 0xab, 0xd6, 0x1d, 0x11, 0x4a, 0x72, 0x1f, 0xd6, 0xb9, + 0x10, 0x89, 0xf0, 0xe3, 0x24, 0xc4, 0xfa, 0x4b, 0xa7, 0x35, 0xcf, 0xd6, 0x85, 0x2d, 0xba, 0x86, + 0xc0, 0x20, 0x09, 0x8b, 0xe6, 0x90, 0x1e, 0x83, 0x9b, 0x97, 0x92, 0x51, 0x74, 0x3a, 0x9f, 0x14, + 0x05, 0x51, 0x13, 0x61, 0xaa, 0x4e, 0xd7, 0x10, 0x2d, 0x8d, 0xc2, 0x4d, 0xf0, 0x98, 0x33, 0xc9, + 0x17, 0x07, 0x42, 0x43, 0xb4, 0x34, 0xbc, 0xdf, 0x0d, 0xb0, 0x2f, 0x26, 0x8b, 0x1c, 0x83, 0x29, + 0x65, 0xec, 0xa7, 0xaf, 0xa7, 0x1c, 0x9f, 0xd1, 0xda, 0xb9, 0xfb, 0x21, 0x49, 0xae, 0x80, 0xe1, + 0xeb, 0x29, 0x57, 0x83, 0x5a, 0xd2, 0xd0, 0xba, 0x54, 0x70, 0xf1, 0x5e, 0x81, 0x1a, 0x6e, 0x67, + 0x09, 0x13, 0x81, 0xef, 0xa5, 0x21, 0x5a, 0x1a, 0x9e, 0xa7, 0x85, 0x40, 0xb3, 0x11, 0x0b, 0x56, + 0xba, 0x47, 0x7b, 0x83, 0xa1, 0x7d, 0x83, 0xd4, 0x61, 0x99, 0x1e, 0xed, 0xdb, 0x86, 0xf7, 0x76, + 0x09, 0x1a, 0xe8, 0xf4, 0x98, 0xb3, 0x38, 0x3d, 0xfb, 0x70, 0xb1, 0xf8, 0x05, 0x9a, 0x0a, 0x54, + 0x25, 0xc6, 0x04, 0xb5, 0x76, 0xbe, 0xbc, 0xf6, 0x8c, 0x8a, 0x5f, 0x1f, 0x0f, 0x43, 0xd4, 0x5c, + 0x2f, 0x92, 0x50, 0x25, 0x82, 0x6a, 0xbb, 0x18, 0x92, 0x80, 0x87, 0x82, 0x05, 0x3c, 0xf0, 0x05, + 0x67, 0x32, 0x99, 0x68, 0xb5, 0xc1, 0xb2, 0x5f, 0xd8, 0xa2, 0xad, 0x12, 0xa0, 0xb8, 0xf6, 0xbe, + 0xd6, 0xe7, 0xd2, 0x64, 0x0d, 0xa8, 0x1f, 0xed, 0x3f, 0xd9, 0x7f, 0xf6, 0xe3, 0xbe, 0x7d, 0x83, + 0x00, 0xac, 0x76, 0x76, 0x87, 0x7b, 0xcf, 0xfb, 0xb6, 0x41, 0x9a, 0x60, 0xf6, 0xfa, 0x3f, 0xd0, + 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0xbf, 0x6b, 0x3a, 0x6c, 0x17, 0x3b, 0x90, 0xec, 0xc1, 0x2a, + 0x1b, 0xa5, 0x85, 0x22, 0xaa, 0x1a, 0x5e, 0x3f, 0x6c, 0x2a, 0xa0, 0x83, 0xce, 0x5d, 0xc8, 0x33, + 0x57, 0x07, 0x52, 0x7d, 0x27, 0xcf, 0xa1, 0xa1, 0xda, 0xda, 0x0f, 0x58, 0xca, 0x30, 0x5f, 0xd7, + 0x0c, 0x9e, 0xa2, 0xea, 0x71, 0x39, 0x12, 0xd1, 0x34, 0x4d, 0x44, 0x77, 0x3d, 0xcf, 0xdc, 0xc5, + 0x60, 0x0a, 0x6a, 0x81, 0x8d, 0xd6, 0x87, 0xfa, 0x1b, 0xb5, 0xc4, 0xf4, 0x34, 0x76, 0x36, 0xae, + 0xe2, 0x3c, 0x8e, 0xa6, 0x53, 0x1e, 0x3c, 0x8a, 0x62, 0xae, 0x9a, 0x45, 0x87, 0xd0, 0xd2, 0x20, + 0x0f, 0xa0, 0xf6, 0x86, 0xcd, 0x5e, 0xa1, 0x46, 0xbf, 0x9f, 0x03, 0xd5, 0xa4, 0xf0, 0xa7, 0x78, + 0x25, 0x07, 0xd0, 0x60, 0x23, 0xd4, 0xe7, 0x38, 0x09, 0x25, 0xea, 0xf6, 0x35, 0x24, 0x1d, 0x74, + 0x1b, 0x24, 0xa1, 0x54, 0xc7, 0x5a, 0x08, 0xa3, 0xc0, 0xaa, 0x4d, 0x32, 0x00, 0xa8, 0x26, 0x5b, + 0xa2, 0xaa, 0x37, 0x76, 0x3e, 0xb9, 0x8a, 0xb0, 0xaf, 0xc7, 0x5d, 0x2a, 0xf5, 0x99, 0x07, 0x51, + 0xab, 0x54, 0x02, 0x49, 0xbe, 0x57, 0x6a, 0x57, 0x47, 0x9a, 0x4f, 0xaf, 0xa2, 0x39, 0x94, 0xf1, + 0x2e, 0x17, 0x69, 0x74, 0x1a, 0x8d, 0x58, 0xca, 0xe5, 0x05, 0xb1, 0xfb, 0x09, 0xd6, 0x82, 0x48, + 0xf0, 0x51, 0x9a, 0x88, 0xd7, 0xfe, 0x98, 0x4d, 0x1d, 0x13, 0x99, 0xda, 0x57, 0x31, 0xf5, 0x4a, + 0xc7, 0xa7, 0x6c, 0xda, 0xbd, 0x99, 0x67, 0xee, 0xf9, 0x50, 0xda, 0x0c, 0x16, 0x1c, 0xbc, 0x63, + 0x80, 0xce, 0xb9, 0x53, 0xcf, 0x13, 0xe2, 0x18, 0xed, 0xe5, 0xeb, 0x4e, 0x5d, 0xc5, 0xa8, 0x53, + 0xcf, 0x83, 0xa8, 0x55, 0x25, 0xd1, 0xfb, 0xd5, 0x00, 0xab, 0x72, 0x24, 0xb7, 0xa0, 0x36, 0x61, + 0x63, 0xae, 0xc7, 0x1a, 0x2b, 0x58, 0xac, 0x29, 0x5e, 0x89, 0x07, 0xab, 0xa7, 0x89, 0x18, 0xb3, + 0x54, 0x4b, 0x1d, 0xb6, 0xb0, 0x42, 0xa8, 0xbe, 0x93, 0xbb, 0xd0, 0x98, 0x72, 0x31, 0x8e, 0x64, + 0xf1, 0x1f, 0x20, 0xf5, 0x34, 0x62, 0x15, 0x17, 0x60, 0xba, 0xb8, 0x20, 0x9b, 0x60, 0x0a, 0xae, + 0x3e, 0x7e, 0xd8, 0x5a, 0xa6, 0xd2, 0x93, 0x12, 0xa3, 0x95, 0xe5, 0x1d, 0x81, 0x55, 0x95, 0x92, + 0x3c, 0x06, 0xab, 0x2a, 0xa4, 0x4e, 0xc3, 0xad, 0x7f, 0x2b, 0xbe, 0xfa, 0x03, 0xa9, 0x42, 0xa8, + 0x59, 0x96, 0xde, 0xfb, 0xcd, 0x00, 0xb3, 0xf4, 0x7a, 0x4f, 0x0a, 0xee, 0x80, 0x55, 0x7c, 0x46, + 0x62, 0xfe, 0x92, 0xc7, 0x3a, 0x0b, 0x48, 0x5b, 0x81, 0xd4, 0x8c, 0x93, 0x70, 0x50, 0x58, 0xff, + 0x69, 0x2a, 0xee, 0x1c, 0xeb, 0x6f, 0xd6, 0xa2, 0xa6, 0x9c, 0x57, 0x30, 0x0b, 0x56, 0x3a, 0x07, + 0x07, 0x83, 0x9f, 0x6d, 0x83, 0x98, 0x50, 0x1b, 0xf6, 0x0f, 0x87, 0xf6, 0x52, 0x21, 0x65, 0xf4, + 0xd9, 0x60, 0xd0, 0xed, 0xec, 0x3e, 0xb1, 0x97, 0x0b, 0x91, 0xa3, 0xfd, 0xe1, 0x11, 0xdd, 0xb7, + 0x6b, 0x85, 0xfb, 0xa3, 0x67, 0x74, 0xb7, 0x6f, 0xaf, 0x74, 0xbf, 0xfd, 0xe3, 0xdd, 0x86, 0xf1, + 0xe7, 0xbb, 0x0d, 0xe3, 0xaf, 0x77, 0x1b, 0xc6, 0xf1, 0x17, 0x61, 0x94, 0x9e, 0xcd, 0x4e, 0xb6, + 0x46, 0xc9, 0x78, 0x1b, 0x73, 0xbb, 0x8d, 0xb9, 0xdd, 0x96, 0xc1, 0x8b, 0xed, 0x97, 0x3b, 0xdb, + 0xf8, 0x47, 0x79, 0x1f, 0xaf, 0x27, 0xab, 0x78, 0xbb, 0xf7, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x72, 0x41, 0x36, 0xe8, 0xa9, 0x0a, 0x00, 0x00, } func (m *NginxDetails) Marshal() (dAtA []byte, err error) { @@ -965,6 +977,15 @@ func (m *NginxDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.ErrorLogPaths) > 0 { + for iNdEx := len(m.ErrorLogPaths) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.ErrorLogPaths[iNdEx]) + copy(dAtA[i:], m.ErrorLogPaths[iNdEx]) + i = encodeVarintNginx(dAtA, i, uint64(len(m.ErrorLogPaths[iNdEx]))) + i-- + dAtA[i] = 0x72 + } + } if len(m.ConfigureArgs) > 0 { for iNdEx := len(m.ConfigureArgs) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.ConfigureArgs[iNdEx]) @@ -1594,6 +1615,12 @@ func (m *NginxDetails) Size() (n int) { n += 1 + l + sovNginx(uint64(l)) } } + if len(m.ErrorLogPaths) > 0 { + for _, s := range m.ErrorLogPaths { + l = len(s) + n += 1 + l + sovNginx(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2230,6 +2257,38 @@ func (m *NginxDetails) Unmarshal(dAtA []byte) error { } m.ConfigureArgs = append(m.ConfigureArgs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrorLogPaths", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNginx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNginx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNginx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ErrorLogPaths = append(m.ErrorLogPaths, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipNginx(dAtA[iNdEx:]) diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto index 7ac92921b4..e458b7a73a 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto @@ -47,6 +47,9 @@ message NginxDetails { // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] repeated string configure_args = 13 [(gogoproto.jsontag) = "configure_args"]; + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + repeated string error_log_paths = 14 [(gogoproto.jsontag) = "error_log_paths"]; } // swagger:model NginxPlusMetaData diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go index d9853555b2..577abc6c05 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go @@ -47,7 +47,7 @@ type NginxBinary interface { Start(nginxId, bin string) error Stop(processId, bin string) error Reload(processId, bin string) error - ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error + ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error GetNginxDetailsFromProcess(nginxProcess *Process) *proto.NginxDetails GetNginxDetailsByID(nginxID string) *proto.NginxDetails GetNginxIDForProcess(nginxProcess *Process) string @@ -209,6 +209,10 @@ func (n *NginxBinaryType) GetNginxDetailsFromProcess(nginxProcess *Process) *pro log.Tracef("Custom conf path set: %v", path) nginxDetailsFacade.ConfPath = path } + if errorLogPaths := getErrorLogPathFromCommand(nginxProcess.Command); len(errorLogPaths) > 0 { + log.Tracef("Custom error log paths set: %v", errorLogPaths) + nginxDetailsFacade.ErrorLogPaths = errorLogPaths + } n.statusUrlMutex.RLock() urlsLength := len(n.statusUrls) @@ -290,15 +294,25 @@ func (n *NginxBinaryType) Reload(processId, bin string) error { } // ValidateConfig tests the config with nginx -t -c configLocation. -func (n *NginxBinaryType) ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { - log.Debugf("Validating config, %s for nginx process, %s", configLocation, processId) - response, err := runCmd(bin, "-t", "-c", configLocation) +func (n *NginxBinaryType) ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { + log.Debugf("Validating config, %s for nginx process, %s, with custom error path %v", configLocation, processId, errorLogPaths) + cmdArgs := make([]string, 0) + cmdArgs = append(cmdArgs, "-t") + if len(configLocation) > 0 { + cmdArgs = append(cmdArgs, "-c") + cmdArgs = append(cmdArgs, configLocation) + } + for _, path := range errorLogPaths { + cmdArgs = append(cmdArgs, "-e") + cmdArgs = append(cmdArgs, path) + } + response, err := runCmd(bin, cmdArgs...) if err != nil { confFiles, auxFiles, getNginxConfigFilesErr := sdk.GetNginxConfigFiles(config) if getNginxConfigFilesErr == nil { n.writeBackup(config, confFiles, auxFiles) } - return fmt.Errorf("error running nginx -t -c %v:\n%s", configLocation, response) + return fmt.Errorf("error running nginx %v:\n%s", strings.Join(cmdArgs, " "), response) } err = n.validateConfigCheckResponse(response, configLocation) @@ -753,6 +767,20 @@ func getConfPathFromCommand(command string) string { return "" } +func getErrorLogPathFromCommand(command string) []string { + commands := strings.Split(command, " ") + errorPath := make([]string, 0) + + for i, command := range commands { + if command == "-e" { + if i < len(commands)-1 { + errorPath = append(errorPath, commands[i+1]) + } + } + } + return errorPath +} + func parseConfigureArguments(line string) (result map[string]interface{}, flags []string) { // need to check for empty strings flags = strings.Split(line[len("configure arguments:"):], " --") diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go index 5036c71237..0128423cc1 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go @@ -440,7 +440,7 @@ func (n *Nginx) writeConfigAndReloadNginx(correlationId string, config *proto.Ng func (n *Nginx) validateConfig(nginx *proto.NginxDetails, correlationId string, config *proto.NginxConfig, configApply *sdk.ConfigApply) { start := time.Now() - err := n.nginxBinary.ValidateConfig(nginx.NginxId, nginx.ProcessPath, nginx.ConfPath, config, configApply) + err := n.nginxBinary.ValidateConfig(nginx.NginxId, nginx.ProcessPath, nginx.ConfPath, nginx.ErrorLogPaths, config, configApply) if err == nil { _, err = n.nginxBinary.ReadConfig(nginx.GetConfPath(), config.GetConfigData().GetNginxId(), n.env.GetSystemUUID()) } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/test/utils/nginx.go b/test/performance/vendor/github.com/nginx/agent/v2/test/utils/nginx.go index 53b2a9779b..dfb498adf5 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/test/utils/nginx.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/test/utils/nginx.go @@ -109,8 +109,8 @@ func (m *MockNginxBinary) Reload(processId, bin string) error { return nil } -func (m *MockNginxBinary) ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { - args := m.Called(processId, bin, configLocation, config, configApply) +func (m *MockNginxBinary) ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { + args := m.Called(processId, bin, configLocation, errorLogPaths, config, configApply) return args.Error(0) } diff --git a/test/utils/nginx.go b/test/utils/nginx.go index 53b2a9779b..dfb498adf5 100644 --- a/test/utils/nginx.go +++ b/test/utils/nginx.go @@ -109,8 +109,8 @@ func (m *MockNginxBinary) Reload(processId, bin string) error { return nil } -func (m *MockNginxBinary) ValidateConfig(processId, bin, configLocation string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { - args := m.Called(processId, bin, configLocation, config, configApply) +func (m *MockNginxBinary) ValidateConfig(processId, bin, configLocation string, errorLogPaths []string, config *proto.NginxConfig, configApply *sdk.ConfigApply) error { + args := m.Called(processId, bin, configLocation, errorLogPaths, config, configApply) return args.Error(0) } diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go b/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go index d3d3ea688b..07f77032ef 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.pb.go @@ -166,7 +166,10 @@ type NginxDetails struct { StatusUrl string `protobuf:"bytes,12,opt,name=status_url,json=statusUrl,proto3" json:"status_url"` // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] - ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + ConfigureArgs []string `protobuf:"bytes,13,rep,name=configure_args,json=configureArgs,proto3" json:"configure_args"` + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + ErrorLogPaths []string `protobuf:"bytes,14,rep,name=error_log_paths,json=errorLogPaths,proto3" json:"error_log_paths"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -296,6 +299,13 @@ func (m *NginxDetails) GetConfigureArgs() []string { return nil } +func (m *NginxDetails) GetErrorLogPaths() []string { + if m != nil { + return m.ErrorLogPaths + } + return nil +} + // swagger:model NginxPlusMetaData // Represents NGINX Plus metadata type NginxPlusMetaData struct { @@ -865,80 +875,82 @@ func init() { func init() { proto.RegisterFile("nginx.proto", fileDescriptor_917f1a70b1fd7255) } var fileDescriptor_917f1a70b1fd7255 = []byte{ - // 1166 bytes of a gzipped FileDescriptorProto + // 1192 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x0e, 0x2d, 0xd9, 0x22, 0x47, 0xb2, 0xcd, 0x6c, 0x5b, 0x80, 0x28, 0x52, 0x53, 0x60, 0x1b, - 0xd4, 0x4d, 0x51, 0x1b, 0x71, 0x5a, 0x14, 0x45, 0x83, 0x06, 0x92, 0xa5, 0x34, 0x46, 0x14, 0xc7, - 0x58, 0xcb, 0x69, 0xeb, 0x0b, 0xbb, 0x16, 0xd7, 0x34, 0x11, 0x4a, 0x14, 0x76, 0xa9, 0x20, 0xc9, - 0x33, 0xf4, 0x49, 0x7a, 0xeb, 0xb1, 0x6f, 0xd0, 0x5b, 0xfb, 0x04, 0x44, 0x91, 0x23, 0x2f, 0x7d, - 0x85, 0x82, 0xb3, 0x4b, 0x4a, 0xfe, 0x6b, 0x72, 0xe9, 0x85, 0x9a, 0xf9, 0x76, 0xbe, 0x6f, 0x39, - 0xb3, 0xb3, 0x43, 0x41, 0x73, 0x12, 0x46, 0x93, 0x97, 0x5b, 0x53, 0x91, 0xa4, 0x09, 0x21, 0xa7, - 0x5f, 0x6d, 0x29, 0x9f, 0x85, 0x7c, 0x92, 0x6e, 0xc9, 0xe0, 0xf9, 0x87, 0xad, 0x51, 0x32, 0x1e, - 0x27, 0x13, 0x15, 0x51, 0x78, 0x93, 0xd3, 0x28, 0xd4, 0x1e, 0x84, 0x49, 0x98, 0x28, 0xdb, 0xfb, - 0x73, 0x19, 0x5a, 0xfb, 0x05, 0xb7, 0xc7, 0x53, 0x16, 0xc5, 0x92, 0x7c, 0x0a, 0x26, 0x6a, 0xf9, - 0x51, 0xe0, 0x18, 0x6d, 0x63, 0xd3, 0xea, 0xb6, 0xf2, 0xcc, 0xad, 0x30, 0xda, 0x40, 0x6b, 0x2f, - 0x20, 0xb7, 0xa1, 0xf1, 0x82, 0x0b, 0x19, 0x25, 0x13, 0x67, 0x09, 0xe3, 0x9a, 0x79, 0xe6, 0x96, - 0x10, 0x2d, 0x0d, 0x72, 0x07, 0xac, 0x62, 0x73, 0x7f, 0xca, 0xd2, 0x33, 0xa7, 0x86, 0x81, 0xab, - 0x79, 0xe6, 0xce, 0x41, 0x6a, 0x16, 0xe6, 0x01, 0x4b, 0xcf, 0xc8, 0x17, 0x00, 0x53, 0x91, 0x8c, - 0xb8, 0x94, 0xc5, 0xee, 0x75, 0x0c, 0x5e, 0xcb, 0x33, 0x77, 0x01, 0xa5, 0x96, 0xb6, 0xf7, 0x02, - 0x72, 0x0f, 0x5a, 0xe5, 0x02, 0xaa, 0x2f, 0x23, 0xc1, 0xce, 0x33, 0xf7, 0x1c, 0x4e, 0x9b, 0xda, - 0x2b, 0xf7, 0x90, 0x29, 0x13, 0xa9, 0x9f, 0x46, 0x63, 0xee, 0xac, 0xb4, 0x8d, 0xcd, 0x9a, 0xda, - 0x63, 0x8e, 0x52, 0x0b, 0xed, 0x61, 0x34, 0xe6, 0xa4, 0x03, 0x37, 0x4f, 0x66, 0x51, 0x9c, 0xfa, - 0xa7, 0x22, 0x19, 0xfb, 0x32, 0x99, 0x89, 0x11, 0x77, 0x1a, 0x6d, 0x63, 0xd3, 0xec, 0x7e, 0x90, - 0x67, 0xee, 0xe5, 0x45, 0xba, 0x8e, 0xd0, 0x43, 0x91, 0x8c, 0x0f, 0x11, 0x20, 0x0f, 0xc0, 0x8e, - 0x13, 0x16, 0xb0, 0x93, 0x98, 0xfb, 0xe3, 0x24, 0x98, 0xc5, 0x5c, 0x3a, 0x66, 0xbb, 0xb6, 0x69, - 0x75, 0xdf, 0xcf, 0x33, 0xf7, 0xd2, 0x1a, 0x5d, 0x2f, 0x91, 0x27, 0x0a, 0x20, 0xf7, 0x61, 0x5d, - 0xcc, 0x26, 0xc5, 0x9b, 0x55, 0x7c, 0x0b, 0xf9, 0xef, 0xe5, 0x99, 0x7b, 0x71, 0x89, 0xae, 0x69, - 0xa0, 0x64, 0xef, 0x42, 0x7d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb9, 0x73, 0x7b, 0xeb, - 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x84, 0xa7, 0xac, 0xc7, 0x52, 0xd6, 0x35, - 0xf3, 0xcc, 0x45, 0x1a, 0xc5, 0x27, 0x79, 0x00, 0x35, 0x29, 0x63, 0xa7, 0x89, 0x1a, 0x9f, 0x5c, - 0xab, 0x71, 0x28, 0xe3, 0x4a, 0xa2, 0x91, 0x67, 0x6e, 0x41, 0xa2, 0xc5, 0x43, 0x97, 0x3d, 0x9d, - 0x49, 0x7f, 0x26, 0x62, 0xa7, 0x35, 0x3f, 0xda, 0x39, 0x8a, 0x65, 0x4f, 0x67, 0xf2, 0x48, 0xc4, - 0xe4, 0x1b, 0x58, 0x53, 0x2d, 0x3b, 0x13, 0xdc, 0x67, 0x22, 0x94, 0xce, 0x2a, 0x66, 0x4c, 0xf2, - 0xcc, 0xbd, 0xb0, 0x42, 0x57, 0x2b, 0xbf, 0x23, 0x42, 0xe9, 0x31, 0xb8, 0x79, 0x29, 0x9f, 0xa2, - 0x59, 0xf9, 0xa4, 0xa8, 0xa9, 0x6a, 0x6a, 0x53, 0x35, 0xab, 0x86, 0x68, 0x69, 0x14, 0x61, 0x82, - 0xc7, 0x9c, 0x49, 0xbe, 0xd8, 0xd3, 0x1a, 0xa2, 0xa5, 0xe1, 0xfd, 0x6e, 0x80, 0x7d, 0x31, 0x5f, - 0x72, 0x0c, 0xa6, 0x94, 0xb1, 0x9f, 0xbe, 0x9a, 0x72, 0xdc, 0x63, 0x6d, 0xe7, 0xee, 0xbb, 0xd4, - 0xa9, 0x02, 0x86, 0xaf, 0xa6, 0x5c, 0xdd, 0xb5, 0x52, 0x86, 0x36, 0xa4, 0x82, 0x8b, 0xf7, 0x0a, - 0xd4, 0xfd, 0x74, 0x96, 0xb0, 0x0e, 0xf8, 0x5e, 0x1a, 0xa2, 0xa5, 0xe1, 0x79, 0xfa, 0x2e, 0x6b, - 0x35, 0x62, 0xc1, 0x72, 0xf7, 0x68, 0x6f, 0x30, 0xb4, 0x6f, 0x90, 0x06, 0xd4, 0xe8, 0xd1, 0xbe, - 0x6d, 0x78, 0xbf, 0x2c, 0x41, 0x13, 0x83, 0x1e, 0x71, 0x16, 0xa7, 0x67, 0xef, 0x7e, 0xdf, 0x7f, - 0x86, 0x96, 0x02, 0xd5, 0x29, 0x61, 0x81, 0xd6, 0x76, 0x3e, 0xbf, 0x36, 0x47, 0xa5, 0xaf, 0xd3, - 0x43, 0x8a, 0xba, 0x9a, 0x8b, 0x22, 0x54, 0xcd, 0x31, 0xb5, 0x5c, 0xf4, 0x79, 0xc0, 0x43, 0xc1, - 0x02, 0x1e, 0xf8, 0x82, 0x33, 0x99, 0x4c, 0xf4, 0xc0, 0xc0, 0x3e, 0xbf, 0xb0, 0x44, 0xd7, 0x4a, - 0x80, 0xa2, 0xef, 0x7d, 0xa9, 0xf3, 0xd2, 0x62, 0x4d, 0x68, 0x1c, 0xed, 0x3f, 0xde, 0x7f, 0xfa, - 0xc3, 0xbe, 0x7d, 0x83, 0x00, 0xac, 0x74, 0x76, 0x87, 0x7b, 0xcf, 0xfa, 0xb6, 0x41, 0x5a, 0x60, - 0xf6, 0xfa, 0xdf, 0xd3, 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0x7f, 0xea, 0x9a, 0xb6, 0x8b, 0x4d, - 0x44, 0xf6, 0x60, 0x85, 0x8d, 0xd2, 0x62, 0xa8, 0xa9, 0x33, 0xbc, 0xfe, 0xbe, 0x28, 0x42, 0x07, - 0x83, 0xbb, 0x90, 0x67, 0xae, 0x26, 0x52, 0xfd, 0x4b, 0x9e, 0x41, 0x53, 0x75, 0xa6, 0x1f, 0xb0, - 0x94, 0x61, 0xbd, 0xae, 0xb9, 0x3b, 0x4a, 0xaa, 0xc7, 0xe5, 0x48, 0x44, 0xd3, 0x34, 0x11, 0xdd, - 0xf5, 0x3c, 0x73, 0x17, 0xc9, 0x14, 0x94, 0x83, 0x8d, 0xd6, 0x87, 0xc6, 0x6b, 0xe5, 0x62, 0x79, - 0x9a, 0x3b, 0x1b, 0x57, 0x69, 0x1e, 0x47, 0xd3, 0x29, 0x0f, 0x1e, 0x46, 0x31, 0x57, 0xcd, 0xa2, - 0x29, 0xb4, 0x34, 0xc8, 0x7d, 0xa8, 0xbf, 0x66, 0xb3, 0x97, 0x38, 0x66, 0xdf, 0xae, 0x81, 0x03, - 0xa1, 0x88, 0xa7, 0xf8, 0x24, 0x07, 0xd0, 0x64, 0x23, 0x1c, 0xb1, 0x71, 0x12, 0x4a, 0x1c, 0xbd, - 0xd7, 0x88, 0x74, 0x30, 0x6c, 0x90, 0x84, 0x52, 0xa5, 0xb5, 0x40, 0xa3, 0xc0, 0xaa, 0x45, 0x32, - 0x00, 0xe0, 0x42, 0x24, 0x42, 0x09, 0xae, 0xa0, 0xe0, 0x47, 0x57, 0x09, 0xf6, 0x8b, 0x28, 0xd4, - 0xc3, 0x01, 0x32, 0x27, 0x51, 0x8b, 0x97, 0x4b, 0xe4, 0x3b, 0x35, 0xb0, 0x1a, 0x28, 0xf3, 0xf1, - 0x55, 0x32, 0x87, 0x32, 0xde, 0xe5, 0x22, 0x8d, 0x4e, 0xa3, 0x11, 0x4b, 0xb9, 0xbc, 0x30, 0xaf, - 0x7e, 0x84, 0xd5, 0x20, 0x12, 0x7c, 0x94, 0x26, 0xe2, 0x95, 0x3f, 0x66, 0x53, 0xc7, 0x44, 0xa5, - 0xf6, 0x55, 0x4a, 0xbd, 0x32, 0xf0, 0x09, 0x9b, 0x76, 0x6f, 0xe6, 0x99, 0x7b, 0x9e, 0x4a, 0x5b, - 0xc1, 0x42, 0x80, 0x77, 0x0c, 0xd0, 0x39, 0x97, 0xf5, 0xbc, 0x20, 0x8e, 0xd1, 0xae, 0x5d, 0x97, - 0x75, 0xc5, 0x51, 0x59, 0xcf, 0x49, 0xd4, 0xaa, 0x8a, 0xe8, 0xfd, 0x6a, 0x80, 0x55, 0x05, 0x92, - 0x5b, 0x50, 0x9f, 0xb0, 0x31, 0xd7, 0xd7, 0x1a, 0x4f, 0xb0, 0xf0, 0x29, 0x3e, 0x89, 0x07, 0x2b, - 0xa7, 0x89, 0x18, 0xb3, 0x54, 0x8f, 0x3a, 0x6c, 0x61, 0x85, 0x50, 0xfd, 0x4b, 0xee, 0x42, 0x73, - 0xca, 0xc5, 0x38, 0x92, 0xc5, 0xa7, 0x5c, 0xea, 0xdb, 0x88, 0xa7, 0xb8, 0x00, 0xd3, 0x45, 0x87, - 0x6c, 0x82, 0x29, 0xb8, 0xfa, 0x7e, 0x61, 0x6b, 0x99, 0x6a, 0x9e, 0x94, 0x18, 0xad, 0x2c, 0xef, - 0x08, 0xac, 0xea, 0x28, 0xc9, 0x23, 0xb0, 0xaa, 0x83, 0xd4, 0x65, 0xb8, 0xf5, 0x5f, 0x87, 0xaf, - 0xfe, 0x44, 0x54, 0x14, 0x6a, 0x96, 0x47, 0xef, 0xfd, 0x66, 0x80, 0x59, 0x46, 0xbd, 0xa5, 0x04, - 0x77, 0xc0, 0x8a, 0x93, 0xd0, 0x8f, 0xf9, 0x0b, 0x1e, 0xeb, 0x2a, 0xa0, 0x6c, 0x05, 0x52, 0x33, - 0x4e, 0xc2, 0x41, 0x61, 0xfd, 0xaf, 0xa5, 0xb8, 0x73, 0xac, 0xbf, 0x59, 0x8b, 0x33, 0xe5, 0xfc, - 0x04, 0xb3, 0x60, 0xb9, 0x73, 0x70, 0x30, 0xf8, 0xc9, 0x36, 0x88, 0x09, 0xf5, 0x61, 0xff, 0x70, - 0x68, 0x2f, 0x15, 0xa3, 0x8c, 0x3e, 0x1d, 0x0c, 0xba, 0x9d, 0xdd, 0xc7, 0x76, 0xad, 0x18, 0x72, - 0xb4, 0x3f, 0x3c, 0xa2, 0xfb, 0x76, 0xbd, 0x08, 0x7f, 0xf8, 0x94, 0xee, 0xf6, 0xed, 0xe5, 0xee, - 0xd7, 0x7f, 0xbc, 0xd9, 0x30, 0xfe, 0x7a, 0xb3, 0x61, 0xfc, 0xfd, 0x66, 0xc3, 0x38, 0xfe, 0x2c, - 0x8c, 0xd2, 0xb3, 0xd9, 0xc9, 0xd6, 0x28, 0x19, 0x6f, 0x63, 0x6d, 0xb7, 0xb1, 0xb6, 0xdb, 0x32, - 0x78, 0xbe, 0xfd, 0x62, 0x67, 0x1b, 0xff, 0x14, 0x7e, 0x8b, 0xcf, 0x93, 0x15, 0xfc, 0xb9, 0xf7, - 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x80, 0x5c, 0xfb, 0x6c, 0x0a, 0x00, 0x00, + 0x17, 0x0d, 0x6d, 0xd9, 0x22, 0xaf, 0x64, 0x99, 0x99, 0xef, 0x2b, 0x40, 0x14, 0xa9, 0x29, 0xb0, + 0x0d, 0xea, 0xa6, 0xa8, 0x8d, 0x38, 0x2d, 0x8a, 0x22, 0x41, 0x03, 0xc9, 0x52, 0x1a, 0x23, 0x8a, + 0x63, 0x8c, 0xe5, 0xb4, 0xf5, 0x86, 0x1d, 0x8b, 0x63, 0x9a, 0x08, 0x25, 0x0a, 0x33, 0x54, 0x90, + 0xe4, 0x19, 0xf2, 0x24, 0xdd, 0x75, 0xd9, 0x37, 0xe8, 0xb2, 0x4f, 0x40, 0x14, 0x59, 0x72, 0xd3, + 0x57, 0x28, 0x78, 0x67, 0x48, 0xc9, 0x7f, 0x4d, 0x36, 0xdd, 0x90, 0x77, 0xce, 0xdc, 0x7b, 0xc8, + 0xb9, 0x3f, 0x87, 0x84, 0xc6, 0x24, 0x8c, 0x26, 0xaf, 0xb6, 0xa6, 0x22, 0x49, 0x13, 0x42, 0x4e, + 0xbf, 0xd9, 0x52, 0x6b, 0x16, 0xf2, 0x49, 0xba, 0x25, 0x83, 0x17, 0x1f, 0x37, 0x47, 0xc9, 0x78, + 0x9c, 0x4c, 0x94, 0x47, 0xb1, 0x9a, 0x9c, 0x46, 0xa1, 0x5e, 0x41, 0x98, 0x84, 0x89, 0xb2, 0xbd, + 0xb7, 0xab, 0xd0, 0xdc, 0x2f, 0x62, 0x7b, 0x3c, 0x65, 0x51, 0x2c, 0xc9, 0xe7, 0x60, 0x22, 0x97, + 0x1f, 0x05, 0x8e, 0xd1, 0x36, 0x36, 0xad, 0x6e, 0x33, 0xcf, 0xdc, 0x0a, 0xa3, 0x75, 0xb4, 0xf6, + 0x02, 0x72, 0x1b, 0xea, 0x2f, 0xb9, 0x90, 0x51, 0x32, 0x71, 0x96, 0xd0, 0xaf, 0x91, 0x67, 0x6e, + 0x09, 0xd1, 0xd2, 0x20, 0x77, 0xc0, 0x2a, 0x1e, 0xee, 0x4f, 0x59, 0x7a, 0xe6, 0x2c, 0xa3, 0xe3, + 0x5a, 0x9e, 0xb9, 0x73, 0x90, 0x9a, 0x85, 0x79, 0xc0, 0xd2, 0x33, 0xf2, 0x15, 0xc0, 0x54, 0x24, + 0x23, 0x2e, 0x65, 0xf1, 0xf4, 0x1a, 0x3a, 0xb7, 0xf2, 0xcc, 0x5d, 0x40, 0xa9, 0xa5, 0xed, 0xbd, + 0x80, 0xdc, 0x83, 0x66, 0xb9, 0x81, 0xec, 0x2b, 0x18, 0x60, 0xe7, 0x99, 0x7b, 0x0e, 0xa7, 0x0d, + 0xbd, 0x2a, 0x9f, 0x21, 0x53, 0x26, 0x52, 0x3f, 0x8d, 0xc6, 0xdc, 0x59, 0x6d, 0x1b, 0x9b, 0xcb, + 0xea, 0x19, 0x73, 0x94, 0x5a, 0x68, 0x0f, 0xa3, 0x31, 0x27, 0x1d, 0xb8, 0x79, 0x32, 0x8b, 0xe2, + 0xd4, 0x3f, 0x15, 0xc9, 0xd8, 0x97, 0xc9, 0x4c, 0x8c, 0xb8, 0x53, 0x6f, 0x1b, 0x9b, 0x66, 0xf7, + 0xa3, 0x3c, 0x73, 0x2f, 0x6f, 0xd2, 0x75, 0x84, 0x1e, 0x89, 0x64, 0x7c, 0x88, 0x00, 0x79, 0x08, + 0x76, 0x9c, 0xb0, 0x80, 0x9d, 0xc4, 0xdc, 0x1f, 0x27, 0xc1, 0x2c, 0xe6, 0xd2, 0x31, 0xdb, 0xcb, + 0x9b, 0x56, 0xf7, 0xff, 0x79, 0xe6, 0x5e, 0xda, 0xa3, 0xeb, 0x25, 0xf2, 0x54, 0x01, 0xe4, 0x01, + 0xac, 0x8b, 0xd9, 0xa4, 0x78, 0xb3, 0x2a, 0xde, 0xc2, 0xf8, 0xff, 0xe5, 0x99, 0x7b, 0x71, 0x8b, + 0xb6, 0x34, 0x50, 0x46, 0xef, 0x42, 0x6d, 0x1a, 0xcf, 0xa4, 0x03, 0x6d, 0x63, 0xb3, 0xb1, 0x73, + 0x7b, 0xeb, 0x72, 0xb3, 0x6c, 0x61, 0x03, 0x1c, 0xc4, 0x33, 0xf9, 0x94, 0xa7, 0xac, 0xc7, 0x52, + 0xd6, 0x35, 0xf3, 0xcc, 0xc5, 0x30, 0x8a, 0x57, 0xf2, 0x10, 0x96, 0xa5, 0x8c, 0x9d, 0x06, 0x72, + 0x7c, 0x76, 0x2d, 0xc7, 0xa1, 0x8c, 0x2b, 0x8a, 0x7a, 0x9e, 0xb9, 0x45, 0x10, 0x2d, 0x2e, 0x3a, + 0xed, 0xe9, 0x4c, 0xfa, 0x33, 0x11, 0x3b, 0xcd, 0x79, 0x69, 0xe7, 0x28, 0xa6, 0x3d, 0x9d, 0xc9, + 0x23, 0x11, 0x93, 0xef, 0xa0, 0xa5, 0x5a, 0x76, 0x26, 0xb8, 0xcf, 0x44, 0x28, 0x9d, 0x35, 0x3c, + 0x31, 0xc9, 0x33, 0xf7, 0xc2, 0x0e, 0x5d, 0xab, 0xd6, 0x1d, 0x11, 0x4a, 0x72, 0x1f, 0xd6, 0xb9, + 0x10, 0x89, 0xf0, 0xe3, 0x24, 0xc4, 0xfa, 0x4b, 0xa7, 0x35, 0xcf, 0xd6, 0x85, 0x2d, 0xba, 0x86, + 0xc0, 0x20, 0x09, 0x8b, 0xe6, 0x90, 0x1e, 0x83, 0x9b, 0x97, 0x92, 0x51, 0x74, 0x3a, 0x9f, 0x14, + 0x05, 0x51, 0x13, 0x61, 0xaa, 0x4e, 0xd7, 0x10, 0x2d, 0x8d, 0xc2, 0x4d, 0xf0, 0x98, 0x33, 0xc9, + 0x17, 0x07, 0x42, 0x43, 0xb4, 0x34, 0xbc, 0xdf, 0x0d, 0xb0, 0x2f, 0x26, 0x8b, 0x1c, 0x83, 0x29, + 0x65, 0xec, 0xa7, 0xaf, 0xa7, 0x1c, 0x9f, 0xd1, 0xda, 0xb9, 0xfb, 0x21, 0x49, 0xae, 0x80, 0xe1, + 0xeb, 0x29, 0x57, 0x83, 0x5a, 0xd2, 0xd0, 0xba, 0x54, 0x70, 0xf1, 0x5e, 0x81, 0x1a, 0x6e, 0x67, + 0x09, 0x13, 0x81, 0xef, 0xa5, 0x21, 0x5a, 0x1a, 0x9e, 0xa7, 0x85, 0x40, 0xb3, 0x11, 0x0b, 0x56, + 0xba, 0x47, 0x7b, 0x83, 0xa1, 0x7d, 0x83, 0xd4, 0x61, 0x99, 0x1e, 0xed, 0xdb, 0x86, 0xf7, 0x76, + 0x09, 0x1a, 0xe8, 0xf4, 0x98, 0xb3, 0x38, 0x3d, 0xfb, 0x70, 0xb1, 0xf8, 0x05, 0x9a, 0x0a, 0x54, + 0x25, 0xc6, 0x04, 0xb5, 0x76, 0xbe, 0xbc, 0xf6, 0x8c, 0x8a, 0x5f, 0x1f, 0x0f, 0x43, 0xd4, 0x5c, + 0x2f, 0x92, 0x50, 0x25, 0x82, 0x6a, 0xbb, 0x18, 0x92, 0x80, 0x87, 0x82, 0x05, 0x3c, 0xf0, 0x05, + 0x67, 0x32, 0x99, 0x68, 0xb5, 0xc1, 0xb2, 0x5f, 0xd8, 0xa2, 0xad, 0x12, 0xa0, 0xb8, 0xf6, 0xbe, + 0xd6, 0xe7, 0xd2, 0x64, 0x0d, 0xa8, 0x1f, 0xed, 0x3f, 0xd9, 0x7f, 0xf6, 0xe3, 0xbe, 0x7d, 0x83, + 0x00, 0xac, 0x76, 0x76, 0x87, 0x7b, 0xcf, 0xfb, 0xb6, 0x41, 0x9a, 0x60, 0xf6, 0xfa, 0x3f, 0xd0, + 0x4e, 0xaf, 0xdf, 0xb3, 0x97, 0xbc, 0xbf, 0x6b, 0x3a, 0x6c, 0x17, 0x3b, 0x90, 0xec, 0xc1, 0x2a, + 0x1b, 0xa5, 0x85, 0x22, 0xaa, 0x1a, 0x5e, 0x3f, 0x6c, 0x2a, 0xa0, 0x83, 0xce, 0x5d, 0xc8, 0x33, + 0x57, 0x07, 0x52, 0x7d, 0x27, 0xcf, 0xa1, 0xa1, 0xda, 0xda, 0x0f, 0x58, 0xca, 0x30, 0x5f, 0xd7, + 0x0c, 0x9e, 0xa2, 0xea, 0x71, 0x39, 0x12, 0xd1, 0x34, 0x4d, 0x44, 0x77, 0x3d, 0xcf, 0xdc, 0xc5, + 0x60, 0x0a, 0x6a, 0x81, 0x8d, 0xd6, 0x87, 0xfa, 0x1b, 0xb5, 0xc4, 0xf4, 0x34, 0x76, 0x36, 0xae, + 0xe2, 0x3c, 0x8e, 0xa6, 0x53, 0x1e, 0x3c, 0x8a, 0x62, 0xae, 0x9a, 0x45, 0x87, 0xd0, 0xd2, 0x20, + 0x0f, 0xa0, 0xf6, 0x86, 0xcd, 0x5e, 0xa1, 0x46, 0xbf, 0x9f, 0x03, 0xd5, 0xa4, 0xf0, 0xa7, 0x78, + 0x25, 0x07, 0xd0, 0x60, 0x23, 0xd4, 0xe7, 0x38, 0x09, 0x25, 0xea, 0xf6, 0x35, 0x24, 0x1d, 0x74, + 0x1b, 0x24, 0xa1, 0x54, 0xc7, 0x5a, 0x08, 0xa3, 0xc0, 0xaa, 0x4d, 0x32, 0x00, 0xa8, 0x26, 0x5b, + 0xa2, 0xaa, 0x37, 0x76, 0x3e, 0xb9, 0x8a, 0xb0, 0xaf, 0xc7, 0x5d, 0x2a, 0xf5, 0x99, 0x07, 0x51, + 0xab, 0x54, 0x02, 0x49, 0xbe, 0x57, 0x6a, 0x57, 0x47, 0x9a, 0x4f, 0xaf, 0xa2, 0x39, 0x94, 0xf1, + 0x2e, 0x17, 0x69, 0x74, 0x1a, 0x8d, 0x58, 0xca, 0xe5, 0x05, 0xb1, 0xfb, 0x09, 0xd6, 0x82, 0x48, + 0xf0, 0x51, 0x9a, 0x88, 0xd7, 0xfe, 0x98, 0x4d, 0x1d, 0x13, 0x99, 0xda, 0x57, 0x31, 0xf5, 0x4a, + 0xc7, 0xa7, 0x6c, 0xda, 0xbd, 0x99, 0x67, 0xee, 0xf9, 0x50, 0xda, 0x0c, 0x16, 0x1c, 0xbc, 0x63, + 0x80, 0xce, 0xb9, 0x53, 0xcf, 0x13, 0xe2, 0x18, 0xed, 0xe5, 0xeb, 0x4e, 0x5d, 0xc5, 0xa8, 0x53, + 0xcf, 0x83, 0xa8, 0x55, 0x25, 0xd1, 0xfb, 0xd5, 0x00, 0xab, 0x72, 0x24, 0xb7, 0xa0, 0x36, 0x61, + 0x63, 0xae, 0xc7, 0x1a, 0x2b, 0x58, 0xac, 0x29, 0x5e, 0x89, 0x07, 0xab, 0xa7, 0x89, 0x18, 0xb3, + 0x54, 0x4b, 0x1d, 0xb6, 0xb0, 0x42, 0xa8, 0xbe, 0x93, 0xbb, 0xd0, 0x98, 0x72, 0x31, 0x8e, 0x64, + 0xf1, 0x1f, 0x20, 0xf5, 0x34, 0x62, 0x15, 0x17, 0x60, 0xba, 0xb8, 0x20, 0x9b, 0x60, 0x0a, 0xae, + 0x3e, 0x7e, 0xd8, 0x5a, 0xa6, 0xd2, 0x93, 0x12, 0xa3, 0x95, 0xe5, 0x1d, 0x81, 0x55, 0x95, 0x92, + 0x3c, 0x06, 0xab, 0x2a, 0xa4, 0x4e, 0xc3, 0xad, 0x7f, 0x2b, 0xbe, 0xfa, 0x03, 0xa9, 0x42, 0xa8, + 0x59, 0x96, 0xde, 0xfb, 0xcd, 0x00, 0xb3, 0xf4, 0x7a, 0x4f, 0x0a, 0xee, 0x80, 0x55, 0x7c, 0x46, + 0x62, 0xfe, 0x92, 0xc7, 0x3a, 0x0b, 0x48, 0x5b, 0x81, 0xd4, 0x8c, 0x93, 0x70, 0x50, 0x58, 0xff, + 0x69, 0x2a, 0xee, 0x1c, 0xeb, 0x6f, 0xd6, 0xa2, 0xa6, 0x9c, 0x57, 0x30, 0x0b, 0x56, 0x3a, 0x07, + 0x07, 0x83, 0x9f, 0x6d, 0x83, 0x98, 0x50, 0x1b, 0xf6, 0x0f, 0x87, 0xf6, 0x52, 0x21, 0x65, 0xf4, + 0xd9, 0x60, 0xd0, 0xed, 0xec, 0x3e, 0xb1, 0x97, 0x0b, 0x91, 0xa3, 0xfd, 0xe1, 0x11, 0xdd, 0xb7, + 0x6b, 0x85, 0xfb, 0xa3, 0x67, 0x74, 0xb7, 0x6f, 0xaf, 0x74, 0xbf, 0xfd, 0xe3, 0xdd, 0x86, 0xf1, + 0xe7, 0xbb, 0x0d, 0xe3, 0xaf, 0x77, 0x1b, 0xc6, 0xf1, 0x17, 0x61, 0x94, 0x9e, 0xcd, 0x4e, 0xb6, + 0x46, 0xc9, 0x78, 0x1b, 0x73, 0xbb, 0x8d, 0xb9, 0xdd, 0x96, 0xc1, 0x8b, 0xed, 0x97, 0x3b, 0xdb, + 0xf8, 0x47, 0x79, 0x1f, 0xaf, 0x27, 0xab, 0x78, 0xbb, 0xf7, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x72, 0x41, 0x36, 0xe8, 0xa9, 0x0a, 0x00, 0x00, } func (m *NginxDetails) Marshal() (dAtA []byte, err error) { @@ -965,6 +977,15 @@ func (m *NginxDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.ErrorLogPaths) > 0 { + for iNdEx := len(m.ErrorLogPaths) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.ErrorLogPaths[iNdEx]) + copy(dAtA[i:], m.ErrorLogPaths[iNdEx]) + i = encodeVarintNginx(dAtA, i, uint64(len(m.ErrorLogPaths[iNdEx]))) + i-- + dAtA[i] = 0x72 + } + } if len(m.ConfigureArgs) > 0 { for iNdEx := len(m.ConfigureArgs) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.ConfigureArgs[iNdEx]) @@ -1594,6 +1615,12 @@ func (m *NginxDetails) Size() (n int) { n += 1 + l + sovNginx(uint64(l)) } } + if len(m.ErrorLogPaths) > 0 { + for _, s := range m.ErrorLogPaths { + l = len(s) + n += 1 + l + sovNginx(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2230,6 +2257,38 @@ func (m *NginxDetails) Unmarshal(dAtA []byte) error { } m.ConfigureArgs = append(m.ConfigureArgs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrorLogPaths", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNginx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNginx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNginx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ErrorLogPaths = append(m.ErrorLogPaths, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipNginx(dAtA[iNdEx:]) diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto b/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto index 7ac92921b4..e458b7a73a 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/nginx.proto @@ -47,6 +47,9 @@ message NginxDetails { // Command line arguments that were used when the NGINX instance was started. // Example: [ "", "with-http_stub_status_module" ] repeated string configure_args = 13 [(gogoproto.jsontag) = "configure_args"]; + // Error log path. + // Example: -e /home/ubuntu/nplus/var/log/error.log -e /home/ubuntu/nplus/var/log/error1.log + repeated string error_log_paths = 14 [(gogoproto.jsontag) = "error_log_paths"]; } // swagger:model NginxPlusMetaData