d8dfun/alibabacloud-eci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use I/O stream for provider logs interface

Browse Source 
Providers must still update the implementaiton to actually gain any
benefit here, but this makes the provider interface a bit more sane.
This commit is contained in:
Brian Goff
2019-04-15 12:25:51 -07:00
parent c346a7f5b8
commit 00ea9dc763
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eci.go
View File

@@ -9,6 +9,8 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"io"
"io/ioutil"
"os" "os"
"strconv" "strconv"
"strings" "strings"
@@ -277,7 +279,7 @@ func (p *ECIProvider) GetPod(ctx context.Context, namespace, name string) (*v1.P
} }
// GetContainerLogs returns the logs of a pod by name that is running inside ECI. // GetContainerLogs returns the logs of a pod by name that is running inside ECI.
func (p *ECIProvider) GetContainerLogs(ctx context.Context, namespace, podName, containerName string, tail int) (string, error) { func (p *ECIProvider) GetContainerLogs(ctx context.Context, namespace, podName, containerName string, opts providers.ContainerLogOpts) (io.ReadCloser, error) {
eciId := "" eciId := ""
for _, cg := range p.GetCgs() { for _, cg := range p.GetCgs() {
if getECITagValue(&cg, "PodName") == podName && getECITagValue(&cg, "NameSpace") == namespace { if getECITagValue(&cg, "PodName") == podName && getECITagValue(&cg, "NameSpace") == namespace {
@@ -286,13 +288,13 @@ func (p *ECIProvider) GetContainerLogs(ctx context.Context, namespace, podName,
} }
} }
if eciId == "" { if eciId == "" {
return "", errors.New(fmt.Sprintf("GetContainerLogs can't find Pod %s-%s", namespace, podName)) return nil, errors.New(fmt.Sprintf("GetContainerLogs can't find Pod %s-%s", namespace, podName))
} }
request := eci.CreateDescribeContainerLogRequest() request := eci.CreateDescribeContainerLogRequest()
request.ContainerGroupId = eciId request.ContainerGroupId = eciId
request.ContainerName = containerName request.ContainerName = containerName
request.Tail = requests.Integer(tail) request.Tail = requests.Integer(opts.Tail)
// get logs from cg // get logs from cg
logContent := "" logContent := ""
@@ -309,7 +311,7 @@ func (p *ECIProvider) GetContainerLogs(ctx context.Context, namespace, podName,
} }
} }
return logContent, nil return ioutil.NopCloser(strings.NewReader(logContent)), nil
} }
// Get full pod name as defined in the provider context // Get full pod name as defined in the provider context