Commit a12c252 1 parent 39b11a9 commit a12c252 Copy full SHA for a12c252
File tree 4 files changed +11
-4
lines changed
4 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ use crate::meta;
110
110
meta:: organization:: OrgUser ,
111
111
meta:: organization:: IngestionPasscode ,
112
112
meta:: organization:: PasscodeResponse ,
113
- request:: status:: HealthzResponse ,
113
+ request:: status:: HealthzResponse ,
114
114
) ,
115
115
) ,
116
116
modifiers( & SecurityAddon ) ,
Original file line number Diff line number Diff line change @@ -173,6 +173,8 @@ pub struct Common {
173
173
pub telemetry_url : String ,
174
174
#[ env_config( name = "ZO_PROMETHEUS_ENABLED" , default = false ) ]
175
175
pub prometheus_enabled : bool ,
176
+ #[ env_config( name = "ZO_PRINT_KEY_CONFIG" , default = false ) ]
177
+ pub print_key_config : bool ,
176
178
}
177
179
178
180
#[ derive( EnvConfig ) ]
@@ -237,7 +239,7 @@ pub struct Log {
237
239
pub level : String ,
238
240
}
239
241
240
- #[ derive( EnvConfig ) ]
242
+ #[ derive( Debug , EnvConfig ) ]
241
243
pub struct Etcd {
242
244
#[ env_config( name = "ZO_ETCD_ADDR" , default = "localhost:2379" ) ]
243
245
pub addr : String ,
@@ -275,7 +277,7 @@ pub struct Sled {
275
277
pub prefix : String ,
276
278
}
277
279
278
- #[ derive( EnvConfig ) ]
280
+ #[ derive( Debug , EnvConfig ) ]
279
281
pub struct S3 {
280
282
#[ env_config( name = "ZO_S3_PROVIDER" , default = "" ) ]
281
283
pub provider : String ,
Original file line number Diff line number Diff line change @@ -417,6 +417,9 @@ pub async fn connect_etcd() -> Option<etcd_client::Client> {
417
417
if CONFIG . common . local_mode {
418
418
return None ;
419
419
}
420
+ if CONFIG . common . print_key_config {
421
+ log:: info!( "etcd init config: {:?}" , CONFIG . etcd) ;
422
+ }
420
423
421
424
let mut opts = etcd_client:: ConnectOptions :: new ( )
422
425
. with_timeout ( core:: time:: Duration :: from_secs ( CONFIG . etcd . command_timeout ) )
Original file line number Diff line number Diff line change @@ -205,7 +205,6 @@ impl S3 {
205
205
206
206
async fn init_s3_config ( ) -> Option < Config > {
207
207
let mut s3config = aws_sdk_s3:: config:: Builder :: new ( ) ;
208
-
209
208
if !CONFIG . s3 . server_url . is_empty ( ) {
210
209
s3config = s3config. endpoint_url ( & CONFIG . s3 . server_url ) ;
211
210
if CONFIG . s3 . provider . eq ( "minio" ) {
@@ -244,6 +243,9 @@ async fn init_s3_client() -> Option<Client> {
244
243
if is_local_disk_storage ( ) {
245
244
return None ;
246
245
}
246
+ if CONFIG . common . print_key_config {
247
+ log:: info!( "s3 init config: {:?}" , CONFIG . s3) ;
248
+ }
247
249
248
250
let client = if CONFIG . s3 . provider . eq ( "aws" ) {
249
251
let s3config = aws_config:: from_env ( )
You can’t perform that action at this time.
0 commit comments