Skip to content

Commit f0bbd68

Browse files
authored
Merge pull request #187 from overture-stack/feat/disable-kafka
add config flag to disable kafka integration
2 parents f07d21e + d2edfb9 commit f0bbd68

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/inbound/messaging/IndexingMessagesStreamListener.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import lombok.NonNull;
2929
import lombok.extern.slf4j.Slf4j;
3030
import lombok.val;
31-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
31+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
3232
import org.springframework.cloud.stream.annotation.EnableBinding;
3333
import org.springframework.cloud.stream.annotation.StreamListener;
3434
import org.springframework.cloud.stream.messaging.Sink;
@@ -39,7 +39,9 @@
3939

4040
@Slf4j
4141
@EnableBinding(Sink.class)
42-
@ConditionalOnProperty(name = "maestro.disableIndexing", havingValue = "false")
42+
@ConditionalOnExpression(
43+
"${maestro.disableIndexing} eq false && ${maestro.disableEventIndexing} eq false"
44+
)
4345
public class IndexingMessagesStreamListener {
4446

4547
private final Indexer indexer;

maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/inbound/messaging/song/SongAnalysisStreamListener.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,17 @@
2929
import java.util.List;
3030
import lombok.extern.slf4j.Slf4j;
3131
import lombok.val;
32-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
32+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
3333
import org.springframework.cloud.stream.annotation.EnableBinding;
3434
import org.springframework.cloud.stream.annotation.StreamListener;
3535
import org.springframework.messaging.handler.annotation.Payload;
3636
import reactor.core.publisher.Flux;
3737

3838
@Slf4j
3939
@EnableBinding(SongAnalysisSink.class)
40-
@ConditionalOnProperty(name = "maestro.disableIndexing", havingValue = "false")
40+
@ConditionalOnExpression(
41+
"${maestro.disableIndexing} eq false && ${maestro.disableEventIndexing} eq false"
42+
)
4143
public class SongAnalysisStreamListener {
4244

4345
private Indexer indexer;

maestro-app/src/main/resources/config/application.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ maestro:
77
# but you still need to define the repositories
88
disableIndexing: false
99

10+
# this can be used to disable kafka integration, this option is preceded by disableIndexing
11+
disableEventIndexing: false
12+
1013
webclient:
1114
# -1 = unlimited memory size
1215
maxInMemorySize: -1

maestro-app/src/test/resources/config/application.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ server.port:
33

44
maestro:
55
disableIndexing: false
6+
disableEventIndexing: false
7+
68
exclusionRules:
79
byId:
810
studyId:

0 commit comments

Comments
 (0)