mirror of
				https://github.com/yggdrasil-network/yggdrasil-go.git
				synced 2025-11-04 11:15:07 +03:00 
			
		
		
		
	Only show build name and version if it is known
This commit is contained in:
		
							parent
							
								
									f2d01aa54d
								
							
						
					
					
						commit
						02f98a2592
					
				
					 3 changed files with 13 additions and 8 deletions
				
			
		| 
						 | 
					@ -183,10 +183,10 @@ func main() {
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		case "getself":
 | 
							case "getself":
 | 
				
			||||||
			for k, v := range res["self"].(map[string]interface{}) {
 | 
								for k, v := range res["self"].(map[string]interface{}) {
 | 
				
			||||||
				if buildname, ok := v.(map[string]interface{})["build_name"].(string); ok {
 | 
									if buildname, ok := v.(map[string]interface{})["build_name"].(string); ok && buildname != "unknown" {
 | 
				
			||||||
					fmt.Println("Build name:", buildname)
 | 
										fmt.Println("Build name:", buildname)
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				if buildversion, ok := v.(map[string]interface{})["build_version"].(string); ok {
 | 
									if buildversion, ok := v.(map[string]interface{})["build_version"].(string); ok && buildversion != "unknown" {
 | 
				
			||||||
					fmt.Println("Build version:", buildversion)
 | 
										fmt.Println("Build version:", buildversion)
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				fmt.Println("IPv6 address:", k)
 | 
									fmt.Println("IPv6 address:", k)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -556,13 +556,18 @@ func (a *admin) getData_getSelf() *admin_nodeInfo {
 | 
				
			||||||
	table := a.core.switchTable.table.Load().(lookupTable)
 | 
						table := a.core.switchTable.table.Load().(lookupTable)
 | 
				
			||||||
	coords := table.self.getCoords()
 | 
						coords := table.self.getCoords()
 | 
				
			||||||
	self := admin_nodeInfo{
 | 
						self := admin_nodeInfo{
 | 
				
			||||||
		{"build_name", GetBuildName()},
 | 
					 | 
				
			||||||
		{"build_version", GetBuildVersion()},
 | 
					 | 
				
			||||||
		{"box_pub_key", hex.EncodeToString(a.core.boxPub[:])},
 | 
							{"box_pub_key", hex.EncodeToString(a.core.boxPub[:])},
 | 
				
			||||||
		{"ip", a.core.GetAddress().String()},
 | 
							{"ip", a.core.GetAddress().String()},
 | 
				
			||||||
		{"subnet", a.core.GetSubnet().String()},
 | 
							{"subnet", a.core.GetSubnet().String()},
 | 
				
			||||||
		{"coords", fmt.Sprint(coords)},
 | 
							{"coords", fmt.Sprint(coords)},
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
						if name := GetBuildName(); name != "unknown" {
 | 
				
			||||||
 | 
							self = append(self, admin_pair{"build_name", name})
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						if version := GetBuildVersion(); version != "unknown" {
 | 
				
			||||||
 | 
							self = append(self, admin_pair{"build_version", version})
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return &self
 | 
						return &self
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -87,11 +87,11 @@ func GetBuildVersion() string {
 | 
				
			||||||
func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) error {
 | 
					func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) error {
 | 
				
			||||||
	c.log = log
 | 
						c.log = log
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if buildName != "" {
 | 
						if name := GetBuildName(); name != "unknown" {
 | 
				
			||||||
		c.log.Println("Build name:", buildName)
 | 
							c.log.Println("Build name:", name)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if buildVersion != "" {
 | 
						if version := GetBuildVersion(); version != "unknown" {
 | 
				
			||||||
		c.log.Println("Build version:", buildVersion)
 | 
							c.log.Println("Build version:", version)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	c.log.Println("Starting up...")
 | 
						c.log.Println("Starting up...")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue