Skip to content

Commit

Permalink
code fmt.
Browse files Browse the repository at this point in the history
  • Loading branch information
bearslyricattack committed Feb 6, 2025
1 parent 778b3c7 commit a56460c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion service/vlogs/request/req.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func QueryLogsByParams(path string, username string, password string, query stri
defer resp.Body.Close()

if resp.StatusCode != http.StatusOK {
return fmt.Errorf("res error,err info: %d", resp)
return fmt.Errorf("res error,err info: %+v", resp)
}
_, err = io.Copy(rw, resp.Body)
if err != nil {
Expand Down
24 changes: 14 additions & 10 deletions service/vlogs/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ package server
import (
"encoding/json"
"fmt"

"github.com/labring/sealos/service/pkg/api"
"github.com/labring/sealos/service/pkg/auth"
"github.com/labring/sealos/service/vlogs/request"

"log"
"net/http"
"net/url"
"strings"

"github.com/labring/sealos/service/pkg/api"
"github.com/labring/sealos/service/vlogs/request"
)

type VLogsServer struct {
Expand All @@ -19,6 +20,9 @@ type VLogsServer struct {
password string
}

const modeTrue = "true"
const modeFalse = "false"

func NewVLogsServer(config *Config) (*VLogsServer, error) {
vl := &VLogsServer{
path: config.Server.Path,
Expand Down Expand Up @@ -90,7 +94,7 @@ func (v *VLogsQuery) getQuery(req *api.VlogsRequest) (string, error) {
v.generateKeywordQuery(req)
v.generateStreamQuery(req)
v.generateCommonQuery(req)
err := v.generateJsonQuery(req)
err := v.generateJSONQuery(req)
if err != nil {
return "", err
}
Expand All @@ -107,8 +111,8 @@ func (v *VLogsQuery) generateKeywordQuery(req *api.VlogsRequest) {
v.query += builder.String()
}

func (v *VLogsQuery) generateJsonQuery(req *api.VlogsRequest) error {
if req.JSONMode != "true" {
func (v *VLogsQuery) generateJSONQuery(req *api.VlogsRequest) error {
if req.JSONMode != modeTrue {
return nil
}
var builder strings.Builder
Expand Down Expand Up @@ -173,8 +177,8 @@ func (v *VLogsQuery) generateStreamQuery(req *api.VlogsRequest) {

func (v *VLogsQuery) generateStdQuery(req *api.VlogsRequest) {
var builder strings.Builder
if req.StderrMode == "true" {
item := fmt.Sprintf(`| stream:="stderr" `)
if req.StderrMode == modeTrue {
item := `| stream:="stderr" `
builder.WriteString(item)
}
v.query += builder.String()
Expand All @@ -185,7 +189,7 @@ func (v *VLogsQuery) generateCommonQuery(req *api.VlogsRequest) {
item := fmt.Sprintf(`_time:%s app:="%s" `, req.Time, req.App)
builder.WriteString(item)
// if query number,dont use limit param
if req.NumberMode == "false" {
if req.NumberMode == modeFalse {
item := fmt.Sprintf(` | limit %s `, req.Limit)
builder.WriteString(item)
}
Expand All @@ -200,7 +204,7 @@ func (v *VLogsQuery) generateDropQuery() {

func (v *VLogsQuery) generateNumberQuery(req *api.VlogsRequest) {
var builder strings.Builder
if req.NumberMode == "true" {
if req.NumberMode == modeTrue {
item := fmt.Sprintf(" | stats by (_time:1%s) count() logs_total ", req.NumberLevel)
builder.WriteString(item)
v.query += builder.String()
Expand Down

0 comments on commit a56460c

Please sign in to comment.