mirror of
https://github.com/openziti/zrok.git
synced 2024-12-22 23:02:52 +01:00
reworked 'tail' function for subordinate access (#789)
This commit is contained in:
parent
94cfba746c
commit
f5601e3a54
@ -46,24 +46,37 @@ func (a *access) tail(data []byte) {
|
||||
if line, err := a.readBuffer.ReadString('\n'); err == nil {
|
||||
line = strings.Trim(line, "\n")
|
||||
if !a.booted {
|
||||
in := make(map[string]interface{})
|
||||
if err := json.Unmarshal([]byte(line), &in); err == nil {
|
||||
if v, found := in["frontend_token"]; found {
|
||||
if str, ok := v.(string); ok {
|
||||
a.frontendToken = str
|
||||
if strings.HasPrefix(line, "{") {
|
||||
in := make(map[string]interface{})
|
||||
if err := json.Unmarshal([]byte(line), &in); err == nil {
|
||||
if v, found := in["message"]; found {
|
||||
if str, ok := v.(string); ok {
|
||||
if str == "boot" {
|
||||
if v, found := in["frontend_token"]; found {
|
||||
if str, ok := v.(string); ok {
|
||||
a.frontendToken = str
|
||||
}
|
||||
}
|
||||
if v, found := in["bind_address"]; found {
|
||||
if str, ok := v.(string); ok {
|
||||
a.bindAddress = str
|
||||
}
|
||||
}
|
||||
a.booted = true
|
||||
}
|
||||
} else {
|
||||
a.bootErr = errors.New(line)
|
||||
}
|
||||
} else {
|
||||
logrus.Warn(line)
|
||||
}
|
||||
} else {
|
||||
a.bootErr = errors.New(line)
|
||||
}
|
||||
if v, found := in["bind_address"]; found {
|
||||
if str, ok := v.(string); ok {
|
||||
a.bindAddress = str
|
||||
}
|
||||
}
|
||||
a.booted = true
|
||||
close(a.bootComplete)
|
||||
} else {
|
||||
a.bootErr = errors.New(line)
|
||||
logrus.Warn(line)
|
||||
}
|
||||
close(a.bootComplete)
|
||||
|
||||
} else {
|
||||
if strings.HasPrefix(line, "{") {
|
||||
in := make(map[string]interface{})
|
||||
|
Loading…
Reference in New Issue
Block a user