فهرست منبع

chore: apply suggestions from code review

Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
JianBo He 1 سال پیش
والد
کامیت
aaf7953968
2فایلهای تغییر یافته به همراه14 افزوده شده و 14 حذف شده
  1. 12 12
      apps/emqx_gateway/src/emqx_gateway_api_listeners.erl
  2. 2 2
      changes/ee/fix-12892.md

+ 12 - 12
apps/emqx_gateway/src/emqx_gateway_api_listeners.erl

@@ -775,9 +775,9 @@ examples_listener() ->
                                     <<"tlsv1.1">>,
                                     <<"tlsv1">>
                                 ],
-                                cacertfile => <<"etc/certs/cacert.pem">>,
-                                certfile => <<"etc/certs/cert.pem">>,
-                                keyfile => <<"etc/certs/key.pem">>,
+                                cacertfile => <<"${EMQX_ETC_DIR}/certs/cacert.pem">>,
+                                certfile => <<"${EMQX_ETC_DIR}/certs/cert.pem">>,
+                                keyfile => <<"${EMQX_ETC_DIR}/certs/key.pem">>,
                                 verify => <<"verify_none">>,
                                 fail_if_no_peer_cert => false
                             },
@@ -821,9 +821,9 @@ examples_listener() ->
                         dtls_options =>
                             #{
                                 versions => [<<"dtlsv1.2">>, <<"dtlsv1">>],
-                                cacertfile => <<"etc/certs/cacert.pem">>,
-                                certfile => <<"etc/certs/cert.pem">>,
-                                keyfile => <<"etc/certs/key.pem">>,
+                                cacertfile => <<"${EMQX_ETC_DIR}/certs/cacert.pem">>,
+                                certfile => <<"${EMQX_ETC_DIR}/certs/cert.pem">>,
+                                keyfile => <<"${EMQX_ETC_DIR}/certs/key.pem">>,
                                 verify => <<"verify_none">>,
                                 fail_if_no_peer_cert => false
                             },
@@ -848,9 +848,9 @@ examples_listener() ->
                         dtls_options =>
                             #{
                                 versions => [<<"dtlsv1.2">>, <<"dtlsv1">>],
-                                cacertfile => <<"etc/certs/cacert.pem">>,
-                                certfile => <<"etc/certs/cert.pem">>,
-                                keyfile => <<"etc/certs/key.pem">>,
+                                cacertfile => <<"${EMQX_ETC_DIR}/certs/cacert.pem">>,
+                                certfile => <<"${EMQX_ETC_DIR}/certs/cert.pem">>,
+                                keyfile => <<"${EMQX_ETC_DIR}/certs/key.pem">>,
                                 verify => <<"verify_none">>,
                                 user_lookup_fun => <<"emqx_tls_psk:lookup">>,
                                 ciphers =>
@@ -951,9 +951,9 @@ examples_listener() ->
                                     <<"tlsv1.1">>,
                                     <<"tlsv1">>
                                 ],
-                                cacertfile => <<"etc/certs/cacert.pem">>,
-                                certfile => <<"etc/certs/cert.pem">>,
-                                keyfile => <<"etc/certs/key.pem">>,
+                                cacertfile => <<"${EMQX_ETC_DIR}/certs/cacert.pem">>,
+                                certfile => <<"${EMQX_ETC_DIR}/certs/cert.pem">>,
+                                keyfile => <<"${EMQX_ETC_DIR}/certs/key.pem">>,
                                 verify => <<"verify_none">>,
                                 fail_if_no_peer_cert => false
                             },

+ 2 - 2
changes/ee/fix-12892.md

@@ -1,3 +1,3 @@
-Fix a logical error in OCPP gateway's handling of downstream BootNotification.
+Fix an error in OCPP gateway's handling of downstream BootNotification.
 
-Fix the `gateways/ocpp/listeners` endpoint to return the correct current connection number.
+Fix the `gateways/ocpp/listeners` endpoint to return the correct number of current connections.