Add comments.

pull/3263/head
Dmitriy Garanzha 8 years ago committed by damour
parent 8ca8b30173
commit 13fba11688

@ -80,7 +80,7 @@ func (c *FakeClient) InstallReleaseFromChart(chart *chart.Chart, ns string, opts
c.Rels = append(c.Rels, release) c.Rels = append(c.Rels, release)
return &rls.InstallReleaseResponse{ return &rls.InstallReleaseResponse{
Response: &rls.InstallReleaseResponse_Release { Response: &rls.InstallReleaseResponse_Release{
Release: release, Release: release,
}, },
}, nil }, nil

@ -1,3 +1,19 @@
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package helm package helm
import ( import (
@ -5,19 +21,22 @@ import (
rls "k8s.io/helm/pkg/proto/hapi/services" rls "k8s.io/helm/pkg/proto/hapi/services"
) )
// TillerOutputLogger logger interface.
type TillerOutputLogger interface { type TillerOutputLogger interface {
Log(level rls.LogItem_Level, message string) Log(level rls.LogItem_Level, message string)
} }
type ConsoleLogger struct {} // ConsoleLogger write tiller logs to stdout.
type ConsoleLogger struct{}
func (logger *ConsoleLogger) Log(level rls.LogItem_Level, message string) { // Log format & write messages to stdout.
func (logger *ConsoleLogger) Log(level rls.LogItem_Level, message string) {
switch level { switch level {
case rls.LogItem_INFO: case rls.LogItem_INFO:
fmt.Println(message) fmt.Println(message)
break break
case rls.LogItem_ERROR: case rls.LogItem_ERROR:
fmt.Println(fmt.Sprintf("Error: %s", message)) fmt.Println(fmt.Sprintf("Error: %s", message))
break break
} }
} }

@ -89,6 +89,7 @@ func Host(host string) Option {
} }
} }
// WithLogger adds tiller logger to client.
func WithLogger(logger TillerOutputLogger) Option { func WithLogger(logger TillerOutputLogger) Option {
return func(opts *options) { return func(opts *options) {
opts.logger = logger opts.logger = logger

@ -28,14 +28,15 @@ import (
"k8s.io/helm/pkg/timeconv" "k8s.io/helm/pkg/timeconv"
) )
// ClientLogger send logs to client.
type ClientLogger struct { type ClientLogger struct {
stream services.ReleaseService_InstallReleaseServer stream services.ReleaseService_InstallReleaseServer
} }
func (logger *ClientLogger) log(level services.LogItem_Level, message string) (error) { func (logger *ClientLogger) log(level services.LogItem_Level, message string) error {
log := &services.InstallReleaseResponse{ log := &services.InstallReleaseResponse{
Response: &services.InstallReleaseResponse_LogItem { Response: &services.InstallReleaseResponse_LogItem{
&services.LogItem{ LogItem: &services.LogItem{
Level: level, Level: level,
Message: message, Message: message,
}, },
@ -45,16 +46,18 @@ func (logger *ClientLogger) log(level services.LogItem_Level, message string) (e
return logger.stream.Send(log) return logger.stream.Send(log)
} }
func (logger *ClientLogger) Info(message string) (error) { // Info log message with info level.
func (logger *ClientLogger) Info(message string) error {
return logger.log(services.LogItem_INFO, message) return logger.log(services.LogItem_INFO, message)
} }
func (logger *ClientLogger) Error(message string) (error) { // Error log message with error level.
func (logger *ClientLogger) Error(message string) error {
return logger.log(services.LogItem_ERROR, message) return logger.log(services.LogItem_ERROR, message)
} }
// InstallRelease installs a release and stores the release record. // InstallRelease installs a release and stores the release record.
func (s *ReleaseServer) InstallRelease(req *services.InstallReleaseRequest, stream services.ReleaseService_InstallReleaseServer) (error) { func (s *ReleaseServer) InstallRelease(req *services.InstallReleaseRequest, stream services.ReleaseService_InstallReleaseServer) error {
clientLogger := ClientLogger{ clientLogger := ClientLogger{
stream: stream, stream: stream,
} }
@ -175,7 +178,7 @@ func (s *ReleaseServer) prepareRelease(req *services.InstallReleaseRequest) (*re
// performRelease runs a release. // performRelease runs a release.
func (s *ReleaseServer) performRelease(r *release.Release, req *services.InstallReleaseRequest) (*services.InstallReleaseResponse, error) { func (s *ReleaseServer) performRelease(r *release.Release, req *services.InstallReleaseRequest) (*services.InstallReleaseResponse, error) {
res := &services.InstallReleaseResponse{ res := &services.InstallReleaseResponse{
Response: &services.InstallReleaseResponse_Release { Response: &services.InstallReleaseResponse_Release{
Release: r, Release: r,
}, },
} }

Loading…
Cancel
Save