Commit da9dd37 1 parent 19f8a14 commit da9dd37 Copy full SHA for da9dd37
File tree 1 file changed +11
-1
lines changed
1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -2784,12 +2784,14 @@ def convert1(self,cfg):
2784
2784
2785
2785
synonyms = sarracenia .config .Config .synonyms
2786
2786
accept_all_seen = False
2787
+ post_broker_seen = False
2788
+ inflight_seen = False
2787
2789
acceptUnmatched_explicit = False
2788
2790
pos_args_present = False
2789
2791
with open (v3_config_path , 'w' ) as v3_cfg :
2790
2792
v3_cfg .write ( f'# created by: sr3 convert { cfg } \n ' )
2791
2793
if component in [ 'shovel' , 'winnow' ]:
2792
- v3_cfg .write ('# topicCopy on is only there for bug-for-bug compat with v2. turn it off if you can.\n ' )
2794
+ v3_cfg .write ('# topicCopy on is only there for bug-for-bug compat with v2. Leave it off if you can.\n ' )
2793
2795
v3_cfg .write ('#topicCopy on\n ' )
2794
2796
2795
2797
if component in [ 'sarra' , 'sender' , 'subscribe' ]:
@@ -2809,9 +2811,17 @@ def convert1(self,cfg):
2809
2811
k = line [0 ]
2810
2812
if k in synonyms :
2811
2813
k = synonyms [k ]
2814
+ if k in [ 'post_broker' ]:
2815
+ post_broker_seen = True
2816
+ if k in [ 'inflight' ]:
2817
+ inflight_seen = True
2812
2818
if k in [ 'queueName' ]:
2813
2819
queueName = line [1 ]
2814
2820
2821
+ if not inflight_seen and post_broker_seen and component in [ 'sarra' , 'sender' , 'subscribe' ]:
2822
+ v3_cfg .write ('#sr3 inflight defaults to None, v2 defaulted to .tmp when post_broker set.\n ' )
2823
+ v3_cfg .write ('inflight .tmp\n ' )
2824
+
2815
2825
#2nd re-write pass.
2816
2826
subtopicFound = False
2817
2827
with open (v2_config_path , 'r' ) as v2_cfg :
You can’t perform that action at this time.
0 commit comments