Skip to content

Commit 5696732

Browse files
authored
Improvements to the logs (#371)
Improvements to the logs.
1 parent aa591a4 commit 5696732

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

vminitd/Sources/vminitd/Server+GRPC.swift

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
731731
request: Com_Apple_Containerization_Sandbox_V3_IpLinkSetRequest, context: GRPC.GRPCAsyncServerCallContext
732732
) async throws -> Com_Apple_Containerization_Sandbox_V3_IpLinkSetResponse {
733733
log.debug(
734-
"ip-link-set",
734+
"ipLinkSet",
735735
metadata: [
736736
"interface": "\(request.interface)",
737737
"up": "\(request.up)",
@@ -744,7 +744,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
744744
try session.linkSet(interface: request.interface, up: request.up, mtu: mtuValue)
745745
} catch {
746746
log.error(
747-
"ip-link-set",
747+
"ipLinkSet",
748748
metadata: [
749749
"error": "\(error)"
750750
])
@@ -758,10 +758,10 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
758758
request: Com_Apple_Containerization_Sandbox_V3_IpAddrAddRequest, context: GRPC.GRPCAsyncServerCallContext
759759
) async throws -> Com_Apple_Containerization_Sandbox_V3_IpAddrAddResponse {
760760
log.debug(
761-
"ip-addr-add",
761+
"ipAddrAdd",
762762
metadata: [
763763
"interface": "\(request.interface)",
764-
"addr": "\(request.address)",
764+
"address": "\(request.address)",
765765
])
766766

767767
do {
@@ -770,7 +770,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
770770
try session.addressAdd(interface: request.interface, address: request.address)
771771
} catch {
772772
log.error(
773-
"ip-addr-add",
773+
"ipAddrAdd",
774774
metadata: [
775775
"error": "\(error)"
776776
])
@@ -784,7 +784,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
784784
request: Com_Apple_Containerization_Sandbox_V3_IpRouteAddLinkRequest, context: GRPC.GRPCAsyncServerCallContext
785785
) async throws -> Com_Apple_Containerization_Sandbox_V3_IpRouteAddLinkResponse {
786786
log.debug(
787-
"ip-route-add-link",
787+
"ipRouteAddLink",
788788
metadata: [
789789
"interface": "\(request.interface)",
790790
"address": "\(request.address)",
@@ -801,7 +801,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
801801
)
802802
} catch {
803803
log.error(
804-
"ip-route-add-link",
804+
"ipRouteAddLink",
805805
metadata: [
806806
"error": "\(error)"
807807
])
@@ -816,7 +816,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
816816
context: GRPC.GRPCAsyncServerCallContext
817817
) async throws -> Com_Apple_Containerization_Sandbox_V3_IpRouteAddDefaultResponse {
818818
log.debug(
819-
"ip-route-add-default",
819+
"ipRouteAddDefault",
820820
metadata: [
821821
"interface": "\(request.interface)",
822822
"gateway": "\(request.gateway)",
@@ -828,7 +828,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
828828
try session.routeAddDefault(interface: request.interface, gateway: request.gateway)
829829
} catch {
830830
log.error(
831-
"ip-route-add-default",
831+
"ipRouteAddDefault",
832832
metadata: [
833833
"error": "\(error)"
834834
])
@@ -844,11 +844,13 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
844844
) async throws -> Com_Apple_Containerization_Sandbox_V3_ConfigureDnsResponse {
845845
let domain = request.hasDomain ? request.domain : nil
846846
log.debug(
847-
"configure-dns",
847+
"configureDns",
848848
metadata: [
849849
"location": "\(request.location)",
850850
"nameservers": "\(request.nameservers)",
851851
"domain": "\(domain ?? "")",
852+
"searchDomains": "\(request.searchDomains)",
853+
"options": "\(request.options)",
852854
])
853855

854856
do {
@@ -867,7 +869,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
867869
log.debug("wrote resolver configuration", metadata: ["path": "\(resolvConf.path)"])
868870
} catch {
869871
log.error(
870-
"configure-dns",
872+
"configureDns",
871873
metadata: [
872874
"error": "\(error)"
873875
])

0 commit comments

Comments
 (0)