Skip to content

Commit 33f09aa

Browse files
committed
Add comments to all public methods in go.
1 parent 697013b commit 33f09aa

File tree

5 files changed

+65
-20
lines changed

5 files changed

+65
-20
lines changed

pkg/config/config.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const phpGet = "Reasno\\GoTask\\Wrapper\\ConfigWrapper::get"
88
const phpSet = "Reasno\\GoTask\\Wrapper\\ConfigWrapper::set"
99
const phpHas = "Reasno\\GoTask\\Wrapper\\ConfigWrapper::has"
1010

11+
// Get retrieves a configuration from PHP, and fallback to the second parameter
12+
// if a config is missing at PHP's end.
1113
func Get(key string, fallback interface{}) (value interface{}, err error) {
1214
client, err := gotask.NewAutoClient()
1315
if err != nil {
@@ -23,6 +25,7 @@ func Get(key string, fallback interface{}) (value interface{}, err error) {
2325
return value, nil
2426
}
2527

28+
// Has checks if a configuration exists in PHP
2629
func Has(key string) (value bool, err error) {
2730
client, err := gotask.NewAutoClient()
2831
if err != nil {
@@ -35,6 +38,7 @@ func Has(key string) (value bool, err error) {
3538
return value, nil
3639
}
3740

41+
// Set sets a configuration in PHP
3842
func Set(key string, val interface{}) (err error) {
3943
client, err := gotask.NewAutoClient()
4044
if err != nil {

pkg/gotask/client.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,23 @@ type Pool struct {
1515

1616
var globalPool *Pool
1717

18+
//SetGo2PHPAddress sets the go2php server socket address
1819
func SetGo2PHPAddress(address string) {
1920
*go2phpAddress = address
2021
}
2122

23+
//GetGo2PHPAddress retrieves the go2php server socket address
2224
func GetGo2PHPAddress() string {
2325
return *go2phpAddress
2426
}
2527

28+
//NewAutoPool creates a connection pool using pre-defined addresses
2629
func NewAutoPool() (*Pool, error) {
2730
addresses := strings.Split(*go2phpAddress, ",")
2831
return NewPool(addresses)
2932
}
3033

34+
//NewPool creates a connection pool
3135
func NewPool(addresses []string) (*Pool, error) {
3236
index := 0
3337
factory := func() (net.Conn, error) {
@@ -42,10 +46,12 @@ func NewPool(addresses []string) (*Pool, error) {
4246
}, nil
4347
}
4448

49+
// Client represents a client for go2php IPC.
4550
type Client struct {
4651
*rpc.Client
4752
}
4853

54+
// NewAutoClient creates a client connected to predefined connection pool.
4955
func NewAutoClient() (c *Client, err error) {
5056
if globalPool == nil {
5157
globalPool, err = NewAutoPool()
@@ -61,6 +67,7 @@ func NewAutoClient() (c *Client, err error) {
6167
return c, nil
6268
}
6369

70+
// NewClient returns a new Client using the connection provided.
6471
func NewClient(conn net.Conn) *Client {
6572
return &Client{
6673
Client: rpc.NewClientWithCodec(goridge.NewClientCodec(conn)),

pkg/gotask/server.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import (
1414
"time"
1515
)
1616

17+
var g run.Group
18+
1719
func checkProcess(pid int, quit chan bool) {
1820
if *standalone {
1921
return
@@ -46,7 +48,7 @@ func GetAddress() string {
4648

4749
// Run the sidecar, receive any fatal errors.
4850
func Run() error {
49-
var g run.Group
51+
5052
if *listenOnPipe {
5153
relay := goridge.NewPipeRelay(os.Stdin, os.Stdout)
5254
codec := goridge.NewCodecWithRelay(relay)
@@ -112,3 +114,13 @@ func Run() error {
112114

113115
return g.Run()
114116
}
117+
118+
// Add an actor (function) to the group. Each actor must be pre-emptable by an
119+
// interrupt function. That is, if interrupt is invoked, execute should return.
120+
// Also, it must be safe to call interrupt even after execute has returned.
121+
//
122+
// The first actor (function) to return interrupts all running actors.
123+
// The error is passed to the interrupt functions, and is returned by Run.
124+
func Add(execute func() error, interrupt func(error)) {
125+
g.Add(execute, interrupt)
126+
}

pkg/log/log.go

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,126 +6,148 @@ import (
66

77
const phpLog = "Reasno\\GoTask\\Wrapper\\LoggerWrapper::log"
88

9-
func Emergency(message string, context map[string]interface{}) error {
9+
// C is a type for passing PSR context.
10+
type C map[string]interface{}
11+
12+
// Map returns itself
13+
func (c C) Map() map[string]interface{} {
14+
return c
15+
}
16+
17+
// Mapper is an interface for PSR Context
18+
type Mapper interface {
19+
Map() map[string]interface{}
20+
}
21+
22+
// Emergency logger
23+
func Emergency(message string, context Mapper) error {
1024
client, err := gotask.NewAutoClient()
1125
if err != nil {
1226
return err
1327
}
1428
payload := map[string]interface{}{
1529
"level": "emergency",
16-
"context": context,
30+
"context": context.Map(),
1731
"message": message,
1832
}
1933
err = client.Call(phpLog, payload, nil)
2034
return err
2135
}
2236

23-
func Alert(message string, context map[string]interface{}) error {
37+
// Alert logger
38+
func Alert(message string, context Mapper) error {
2439
client, err := gotask.NewAutoClient()
2540
if err != nil {
2641
return err
2742
}
2843
payload := map[string]interface{}{
2944
"level": "alert",
30-
"context": context,
45+
"context": context.Map(),
3146
"message": message,
3247
}
3348
err = client.Call(phpLog, payload, nil)
3449
return err
3550
}
3651

37-
func Critical(message string, context map[string]interface{}) error {
52+
// Critical logger
53+
func Critical(message string, context Mapper) error {
3854
client, err := gotask.NewAutoClient()
3955
if err != nil {
4056
return err
4157
}
4258
payload := map[string]interface{}{
4359
"level": "critical",
44-
"context": context,
60+
"context": context.Map(),
4561
"message": message,
4662
}
4763
err = client.Call(phpLog, payload, nil)
4864
return err
4965
}
5066

51-
func Error(message string, context map[string]interface{}) error {
67+
// Error logger
68+
func Error(message string, context Mapper) error {
5269
client, err := gotask.NewAutoClient()
5370
if err != nil {
5471
return err
5572
}
5673
payload := map[string]interface{}{
5774
"level": "error",
58-
"context": context,
75+
"context": context.Map(),
5976
"message": message,
6077
}
6178
err = client.Call(phpLog, payload, nil)
6279
return err
6380
}
6481

65-
func Warning(message string, context map[string]interface{}) error {
82+
// Warning logger
83+
func Warning(message string, context Mapper) error {
6684
client, err := gotask.NewAutoClient()
6785
if err != nil {
6886
return err
6987
}
7088
payload := map[string]interface{}{
7189
"level": "warning",
72-
"context": context,
90+
"context": context.Map(),
7391
"message": message,
7492
}
7593
err = client.Call(phpLog, payload, nil)
7694
return err
7795
}
7896

79-
func Notice(message string, context map[string]interface{}) error {
97+
// Notice logger
98+
func Notice(message string, context Mapper) error {
8099
client, err := gotask.NewAutoClient()
81100
if err != nil {
82101
return err
83102
}
84103
payload := map[string]interface{}{
85104
"level": "notice",
86-
"context": context,
105+
"context": context.Map(),
87106
"message": message,
88107
}
89108
err = client.Call(phpLog, payload, nil)
90109
return err
91110
}
92111

93-
func Info(message string, context map[string]interface{}) error {
112+
// Info logger
113+
func Info(message string, context Mapper) error {
94114
client, err := gotask.NewAutoClient()
95115
if err != nil {
96116
return err
97117
}
98118
payload := map[string]interface{}{
99119
"level": "info",
100-
"context": context,
120+
"context": context.Map(),
101121
"message": message,
102122
}
103123
err = client.Call(phpLog, payload, nil)
104124
return err
105125
}
106126

107-
func Debug(message string, context map[string]interface{}) error {
127+
// Debug logger
128+
func Debug(message string, context Mapper) error {
108129
client, err := gotask.NewAutoClient()
109130
if err != nil {
110131
return err
111132
}
112133
payload := map[string]interface{}{
113134
"level": "debug",
114-
"context": context,
135+
"context": context.Map(),
115136
"message": message,
116137
}
117138
err = client.Call(phpLog, payload, nil)
118139
return err
119140
}
120141

121-
func Log(level string, message string, context map[string]interface{}) error {
142+
// Log logs a message at any given level
143+
func Log(level string, message string, context Mapper) error {
122144
client, err := gotask.NewAutoClient()
123145
if err != nil {
124146
return err
125147
}
126148
payload := map[string]interface{}{
127149
"level": level,
128-
"context": context,
150+
"context": context.Map(),
129151
"message": message,
130152
}
131153
err = client.Call(phpLog, payload, nil)

pkg/log/log_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
func testInfo(t *testing.T) {
9-
err := Info("hello", map[string]interface{}{
9+
err := Info("hello", C{
1010
"Some": "Value",
1111
})
1212
if err != nil {

0 commit comments

Comments
 (0)