Skip to content

Commit c4d7da6

Browse files
debugtalkdebugtalk
committed
fix: close log file
1 parent 54aeb67 commit c4d7da6

4 files changed

Lines changed: 29 additions & 39 deletions

File tree

‎fungo/examples/logs/hashicorp_grpc_go.log‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
[INFO] fungo: init plugin: path=fungo/examples/debugtalk.bin
33
[INFO] hc-grpc-go: launch the plugin process
44
[DEBUG] hc-grpc-go: starting plugin: path=fungo/examples/debugtalk.bin args=["fungo/examples/debugtalk.bin"]
5-
[DEBUG] hc-grpc-go: plugin started: path=fungo/examples/debugtalk.bin pid=63329
5+
[DEBUG] hc-grpc-go: plugin started: path=fungo/examples/debugtalk.bin pid=72587
66
[DEBUG] hc-grpc-go: waiting for RPC address: path=fungo/examples/debugtalk.bin
7-
[DEBUG] hc-grpc-go.debugtalk.bin: 2023/08/06 23:44:26 plugin init function called
7+
[DEBUG] hc-grpc-go.debugtalk.bin: 2023/08/07 00:15:38 plugin init function called
88
[INFO] hc-grpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=sum_ints
99
[INFO] hc-grpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=sum_two_int
1010
[INFO] hc-grpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=sum
@@ -15,18 +15,18 @@
1515
[INFO] hc-grpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=teardown_hook_example
1616
[INFO] hc-grpc-go.debugtalk.bin: [INFO] fungo: start plugin server in gRPC mode
1717
[DEBUG] hc-grpc-go: using plugin: version=1
18-
[DEBUG] hc-grpc-go.debugtalk.bin: plugin address: address=/var/folders/nm/6prc3p4s2tg_27_3fwfv22vh0000gp/T/plugin3126265366 network=unix timestamp="2023-08-06T23:44:26.511+0800"
18+
[DEBUG] hc-grpc-go.debugtalk.bin: plugin address: address=/var/folders/nm/6prc3p4s2tg_27_3fwfv22vh0000gp/T/plugin1680872672 network=unix timestamp="2023-08-07T00:15:38.658+0800"
1919
[INFO] hc-grpc-go: load hashicorp go plugin success: path=fungo/examples/debugtalk.bin
2020
[DEBUG] hc-grpc-go: check if plugin has function: funcName=sum_ints
2121
[DEBUG] fungo: gRPC_client GetNames() start
2222
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server GetNames() start
23-
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["sum_ints", "sumstrings", "sum_strings", "setup_hook_example", "setuphookexample", "teardown_hook_example", "sumtwoint", "sumtwostring", "teardownhookexample", "sumints", "sum_two_int", "sum", "sum_two_string", "concatenate"]
23+
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["sumstrings", "concatenate", "setup_hook_example", "setuphookexample", "sum_two_int", "sumtwoint", "sum_two_string", "sum_strings", "teardownhookexample", "sumints", "sumtwostring", "teardown_hook_example", "sum_ints", "sum"]
2424
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server GetNames() success
2525
[DEBUG] fungo: gRPC_client GetNames() success
2626
[DEBUG] hc-grpc-go: check if plugin has function: funcName=concatenate
2727
[DEBUG] fungo: gRPC_client GetNames() start
2828
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server GetNames() start
29-
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["sumtwoint", "sumtwostring", "teardownhookexample", "sumints", "sum_two_int", "sum", "sum_two_string", "concatenate", "sum_ints", "sumstrings", "sum_strings", "setup_hook_example", "setuphookexample", "teardown_hook_example"]
29+
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["teardown_hook_example", "sumints", "sumtwostring", "sum_ints", "sum", "sum_two_string", "sum_strings", "sumstrings", "concatenate", "setup_hook_example", "setuphookexample", "sum_two_int", "sumtwoint", "teardownhookexample"]
3030
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server GetNames() success
3131
[DEBUG] fungo: gRPC_client GetNames() success
3232
[INFO] fungo: gRPC_client Call() start: funcName=sum_ints funcArgs=[1, 2, 3, 4]
@@ -55,23 +55,12 @@
5555
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server Call() success
5656
[INFO] fungo: gRPC_client Call() success: result=abc
5757
[INFO] fungo: gRPC_client Call() start: funcName=concatenate funcArgs=[a, 2, c, 3.4]
58-
[INFO] fungo: gRPC_client Call() success: result=a2c3.4
59-
[INFO] hc-grpc-go: quit hashicorp plugin process
6058
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server Call() start
6159
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: plugin function execution: funcName=concatenate args=[a, 2, c, 3.4]
62-
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server Call() success
63-
[DEBUG] hc-grpc-go.stdio: received EOF, stopping recv loop: err="rpc error: code = Unavailable desc = error reading from server: EOF"
64-
[INFO] hc-grpc-go: plugin process exited: path=fungo/examples/debugtalk.bin pid=63329
65-
[DEBUG] hc-grpc-go: plugin exited
66-
[INFO] hc-grpc-go: [teardown test] remove hashicorp plugin: path=fungo/examples/debugtalk.bin
67-
O] fungo: gRPC_client Call() success: result=abc
68-
[INFO] fungo: gRPC_client Call() start: funcName=concatenate funcArgs=[a, 2, c, 3.4]
69-
[DEBUG] hc-grpc-go.debugtalk.bin: 2023-08-06T23:42:36.210+0800 [DEBUG] fungo: gRPC_server Call() start
70-
[DEBUG] hc-grpc-go.debugtalk.bin: 2023-08-06T23:42:36.210+0800 [DEBUG] fungo.func_exec: plugin function execution: funcName=concatenate args=[a, 2, c, 3.4]
71-
[DEBUG] hc-grpc-go.debugtalk.bin: 2023-08-06T23:42:36.210+0800 [DEBUG] fungo: gRPC_server Call() success
7260
[INFO] fungo: gRPC_client Call() success: result=a2c3.4
7361
[INFO] hc-grpc-go: quit hashicorp plugin process
62+
[DEBUG] hc-grpc-go.debugtalk.bin: [DEBUG] fungo: gRPC_server Call() success
7463
[DEBUG] hc-grpc-go.stdio: received EOF, stopping recv loop: err="rpc error: code = Unavailable desc = error reading from server: EOF"
75-
[INFO] hc-grpc-go: plugin process exited: path=fungo/examples/debugtalk.bin pid=62304
64+
[INFO] hc-grpc-go: plugin process exited: path=fungo/examples/debugtalk.bin pid=72587
7665
[DEBUG] hc-grpc-go: plugin exited
77-
[INFO] hc-grpc-go: [teardown test] remove hashicorp plugin: path=fungo/examples/debugtalk.bin
66+
[INFO] fungo: close log file

‎fungo/examples/logs/hashicorp_rpc_go.log‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
[INFO] fungo: init plugin: path=fungo/examples/debugtalk.bin
33
[INFO] hc-rpc-go: launch the plugin process
44
[DEBUG] hc-rpc-go: starting plugin: path=fungo/examples/debugtalk.bin args=["fungo/examples/debugtalk.bin"]
5-
[DEBUG] hc-rpc-go: plugin started: path=fungo/examples/debugtalk.bin pid=62848
5+
[DEBUG] hc-rpc-go: plugin started: path=fungo/examples/debugtalk.bin pid=72483
66
[DEBUG] hc-rpc-go: waiting for RPC address: path=fungo/examples/debugtalk.bin
7-
[DEBUG] hc-rpc-go.debugtalk.bin: 2023/08/06 23:43:45 plugin init function called
7+
[DEBUG] hc-rpc-go.debugtalk.bin: 2023/08/07 00:15:33 plugin init function called
88
[INFO] hc-rpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=sum_ints
99
[INFO] hc-rpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=sum_two_int
1010
[INFO] hc-rpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=sum
@@ -15,18 +15,18 @@
1515
[INFO] hc-rpc-go.debugtalk.bin: [INFO] fungo: register plugin function: funcName=teardown_hook_example
1616
[INFO] hc-rpc-go.debugtalk.bin: [INFO] fungo: start plugin server in RPC mode
1717
[DEBUG] hc-rpc-go: using plugin: version=1
18-
[DEBUG] hc-rpc-go.debugtalk.bin: plugin address: address=/var/folders/nm/6prc3p4s2tg_27_3fwfv22vh0000gp/T/plugin1072589984 network=unix timestamp="2023-08-06T23:43:45.785+0800"
18+
[DEBUG] hc-rpc-go.debugtalk.bin: plugin address: address=/var/folders/nm/6prc3p4s2tg_27_3fwfv22vh0000gp/T/plugin4148870767 network=unix timestamp="2023-08-07T00:15:33.267+0800"
1919
[INFO] hc-rpc-go: load hashicorp go plugin success: path=fungo/examples/debugtalk.bin
2020
[DEBUG] hc-rpc-go: check if plugin has function: funcName=sum_ints
2121
[DEBUG] fungo: rpc_client GetNames() start
2222
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo: rpc_server GetNames() start
23-
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["sum_ints", "sumtwoint", "sum_two_string", "sumtwostring", "teardown_hook_example", "sum_strings", "setuphookexample", "sum_two_int", "sumstrings", "concatenate", "setup_hook_example", "sumints", "sum", "teardownhookexample"]
23+
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["sum_ints", "sum_strings", "sumstrings", "concatenate", "sumints", "sum_two_string", "setuphookexample", "sumtwoint", "setup_hook_example", "teardownhookexample", "sum_two_int", "sum", "sumtwostring", "teardown_hook_example"]
2424
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo: rpc_server GetNames() success
2525
[DEBUG] fungo: rpc_client GetNames() success
2626
[DEBUG] hc-rpc-go: check if plugin has function: funcName=concatenate
2727
[DEBUG] fungo: rpc_client GetNames() start
2828
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo: rpc_server GetNames() start
29-
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["sumints", "sum", "teardownhookexample", "sum_ints", "sumtwoint", "sum_two_string", "sumtwostring", "teardown_hook_example", "sum_strings", "setuphookexample", "sum_two_int", "sumstrings", "concatenate", "setup_hook_example"]
29+
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo.func_exec: get registered plugin functions: names=["sumtwoint", "setup_hook_example", "teardownhookexample", "sum_two_int", "sum", "sumtwostring", "teardown_hook_example", "sum_ints", "sum_strings", "sumstrings", "concatenate", "sumints", "sum_two_string", "setuphookexample"]
3030
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo: rpc_server GetNames() success
3131
[DEBUG] fungo: rpc_client GetNames() success
3232
[INFO] fungo: rpc_client Call() start: funcName=sum_ints funcArgs=[1, 2, 3, 4]
@@ -60,17 +60,7 @@
6060
[DEBUG] hc-rpc-go.debugtalk.bin: [DEBUG] fungo: rpc_server Call() success
6161
[INFO] fungo: rpc_client Call() success: result=a2c3.4
6262
[INFO] hc-rpc-go: quit hashicorp plugin process
63-
[DEBUG] hc-rpc-go.debugtalk.bin: 2023/08/06 23:43:45 [DEBUG] plugin: plugin server: accept unix /var/folders/nm/6prc3p4s2tg_27_3fwfv22vh0000gp/T/plugin1072589984: use of closed network connection
64-
[INFO] hc-rpc-go: plugin process exited: path=fungo/examples/debugtalk.bin pid=62848
63+
[DEBUG] hc-rpc-go.debugtalk.bin: 2023/08/07 00:15:33 [DEBUG] plugin: plugin server: accept unix /var/folders/nm/6prc3p4s2tg_27_3fwfv22vh0000gp/T/plugin4148870767: use of closed network connection
64+
[INFO] hc-rpc-go: plugin process exited: path=fungo/examples/debugtalk.bin pid=72483
6565
[DEBUG] hc-rpc-go: plugin exited
66-
[INFO] hc-rpc-go: [teardown test] remove hashicorp plugin: path=fungo/examples/debugtalk.bin
67-
INFO] fungo: rpc_client Call() start: funcName=concatenate funcArgs=[a, 2, c, 3.4]
68-
[DEBUG] hc-rpc-go.debugtalk.bin: 2023-08-06T23:43:12.990+0800 [DEBUG] fungo: rpc_server Call() start
69-
[DEBUG] hc-rpc-go.debugtalk.bin: 2023-08-06T23:43:12.990+0800 [DEBUG] fungo.func_exec: plugin function execution: funcName=concatenate args=[a, 2, c, 3.4]
70-
[DEBUG] hc-rpc-go.debugtalk.bin: 2023-08-06T23:43:12.990+0800 [DEBUG] fungo: rpc_server Call() success
71-
[INFO] fungo: rpc_client Call() success: result=a2c3.4
72-
[INFO] hc-rpc-go: quit hashicorp plugin process
73-
[DEBUG] hc-rpc-go.debugtalk.bin: 2023/08/06 23:43:12 [DEBUG] plugin: plugin server: accept unix /var/folders/nm/6prc3p4s2tg_27_3fwfv22vh0000gp/T/plugin2693576263: use of closed network connection
74-
[INFO] hc-rpc-go: plugin process exited: path=fungo/examples/debugtalk.bin pid=62553
75-
[DEBUG] hc-rpc-go: plugin exited
76-
[INFO] hc-rpc-go: [teardown test] remove hashicorp plugin: path=fungo/examples/debugtalk.bin
66+
[INFO] fungo: close log file

‎fungo/init.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ var Logger = hclog.New(&hclog.LoggerOptions{
2222
Color: hclog.AutoColor,
2323
})
2424

25+
var file *os.File
26+
2527
func InitLogger(logLevel hclog.Level, logFile string, disableTime bool) hclog.Logger {
2628
output := hclog.DefaultOutput
2729
if logFile != "" {
28-
file, err := os.OpenFile(logFile, os.O_CREATE|os.O_RDWR, 0666)
30+
var err error
31+
file, err = os.OpenFile(logFile, os.O_CREATE|os.O_RDWR, 0666)
2932
if err != nil {
3033
logger.Error("open log file failed", "error", err)
3134
os.Exit(1)
@@ -44,6 +47,14 @@ func InitLogger(logLevel hclog.Level, logFile string, disableTime bool) hclog.Lo
4447
return logger
4548
}
4649

50+
func CloseLogFile() error {
51+
if file != nil {
52+
logger.Info("close log file")
53+
return file.Close()
54+
}
55+
return nil
56+
}
57+
4758
// PluginTypeEnvName is used to specify hashicorp go plugin type, rpc/grpc
4859
const PluginTypeEnvName = "HRP_PLUGIN_TYPE"
4960

‎hashicorp_plugin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,5 @@ func (p *hashicorpPlugin) Quit() error {
136136
// kill hashicorp plugin process
137137
logger.Info("quit hashicorp plugin process")
138138
p.client.Kill()
139-
return nil
139+
return fungo.CloseLogFile()
140140
}

0 commit comments

Comments
 (0)