Skip to content

Commit 2a8e5b4

Browse files
committed
fix: use STACKABLE_LOG_DIR from framework
1 parent 2e2e052 commit 2a8e5b4

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

rust/operator-binary/src/controller/build/properties/product_logging/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ use stackable_operator::{
66
self,
77
spec::{ContainerLogConfig, ContainerLogConfigChoice, Logging},
88
},
9+
v2::product_logging::framework::STACKABLE_LOG_DIR,
910
};
1011

11-
use crate::crd::{Container, MAX_NIFI_LOG_FILES_SIZE, STACKABLE_LOG_DIR};
12+
use crate::crd::{Container, MAX_NIFI_LOG_FILES_SIZE};
1213

1314
pub const NIFI_LOG_FILE: &str = "nifi.log4j.xml";
1415

rust/operator-binary/src/controller/build/resource/statefulset.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use stackable_operator::{
4242
meta::ownerreference_from_resource,
4343
pod::container::{EnvVarSet, new_container_builder},
4444
},
45-
product_logging::framework::vector_container,
45+
product_logging::framework::{STACKABLE_LOG_DIR, vector_container},
4646
types::kubernetes::{ContainerName, VolumeName},
4747
},
4848
};
@@ -65,7 +65,7 @@ use crate::{
6565
crd::{
6666
BALANCE_PORT, BALANCE_PORT_NAME, Container, HTTPS_PORT, HTTPS_PORT_NAME, METRICS_PORT,
6767
METRICS_PORT_NAME, NifiRole, NifiRoleType, PROTOCOL_PORT, PROTOCOL_PORT_NAME,
68-
STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
68+
STACKABLE_LOG_CONFIG_DIR,
6969
authorization::NifiAccessPolicyProvider,
7070
constants::{NIFI_CONFIG_DIRECTORY, NIFI_PYTHON_WORKING_DIRECTORY},
7171
storage::{NifiRepository, PERSISTENT_REPOSITORIES},

rust/operator-binary/src/crd/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ pub const BALANCE_PORT: u16 = 6243;
5959
pub const METRICS_PORT_NAME: &str = "metrics";
6060
pub const METRICS_PORT: u16 = 8081;
6161

62-
pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
6362
pub const STACKABLE_LOG_CONFIG_DIR: &str = "/stackable/log_config";
6463

6564
pub const MAX_NIFI_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity::from_mebi(10.0);

0 commit comments

Comments
 (0)