@@ -56,8 +56,8 @@ def __init__(self, args: dict = None):
56
56
probe_config ["spp" ]["verify_host" ] = str (self .get_config_value (
57
57
"SPP_TLS_VERIFY_HOST" , probe_config ["spp" ].get ("verify_host" ), True
58
58
)).lower () == "true"
59
- probe_config ["spp" ]["disable_tls " ] = str (self .get_config_value (
60
- "SPP_DISABLE_TLS " , probe_config ["spp" ].get ("disable_tls " ), False
59
+ probe_config ["spp" ]["ssl_enabled " ] = str (self .get_config_value (
60
+ "SPP_HTTP_SSL_ENABLED " , probe_config ["spp" ].get ("ssl_enabled " ), True
61
61
)).lower () == "true"
62
62
probe_config ["skywalking" ]["agent" ]["service_name" ] = self .get_config_value (
63
63
"SPP_SERVICE_NAME" , probe_config ["skywalking" ]["agent" ].get ("service_name" ), "spp"
@@ -90,21 +90,21 @@ def attach(self):
90
90
collector_address = self .probe_config ["skywalking" ]["collector" ]["backend_service" ],
91
91
service_name = self .probe_config ["skywalking" ]["agent" ]["service_name" ],
92
92
log_reporter_active = True ,
93
- force_tls = self .probe_config ["spp" ]["disable_tls " ] is False ,
93
+ force_tls = self .probe_config ["spp" ]["ssl_enabled " ] is True ,
94
94
log_reporter_formatted = False
95
95
)
96
96
agent .start ()
97
97
98
98
ca_data = None
99
- if self .probe_config ["spp" ]["disable_tls " ] is False \
99
+ if self .probe_config ["spp" ]["ssl_enabled " ] is True \
100
100
and self .probe_config ["spp" ].get ("probe_certificate" ) is not None :
101
101
ca_data = "-----BEGIN CERTIFICATE-----\n " + \
102
102
self .probe_config ["spp" ]["probe_certificate" ] + \
103
103
"\n -----END CERTIFICATE-----"
104
104
105
105
ssl_ctx = ssl .create_default_context (cadata = ca_data )
106
106
ssl_ctx .check_hostname = self .probe_config ["spp" ]["verify_host" ]
107
- if self .probe_config ["spp" ]["disable_tls " ] is True :
107
+ if self .probe_config ["spp" ]["ssl_enabled " ] is False :
108
108
ssl_ctx = None
109
109
elif ssl_ctx .check_hostname is True :
110
110
ssl_ctx .verify_mode = ssl .CERT_REQUIRED
0 commit comments