Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Canread
Gopsutil
提交
99d93f93
G
Gopsutil
项目概览
Canread
/
Gopsutil
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gopsutil
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
99d93f93
编写于
10月 13, 2015
作者:
N
Nick Galbreath
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
shirou/gopsutil#90 make hostinfo more robust
上级
6a274c36
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
38 deletion
+30
-38
host/host_darwin.go
host/host_darwin.go
+3
-5
host/host_freebsd.go
host/host_freebsd.go
+4
-6
host/host_linux.go
host/host_linux.go
+5
-6
host/host_windows.go
host/host_windows.go
+18
-21
未找到文件。
host/host_darwin.go
浏览文件 @
99d93f93
...
...
@@ -23,10 +23,9 @@ func HostInfo() (*HostInfoStat, error) {
}
hostname
,
err
:=
os
.
Hostname
()
if
err
!
=
nil
{
ret
urn
ret
,
err
if
err
=
=
nil
{
ret
.
Hostname
=
hostname
}
ret
.
Hostname
=
hostname
platform
,
family
,
version
,
err
:=
GetPlatformInformation
()
if
err
==
nil
{
...
...
@@ -46,9 +45,8 @@ func HostInfo() (*HostInfoStat, error) {
v
:=
strings
.
Replace
(
values
[
2
],
","
,
""
,
1
)
t
,
err
:=
strconv
.
ParseUint
(
v
,
10
,
64
)
if
err
!=
nil
{
ret
urn
ret
,
err
ret
.
Uptime
=
t
}
ret
.
Uptime
=
t
}
return
ret
,
nil
...
...
host/host_freebsd.go
浏览文件 @
99d93f93
...
...
@@ -29,10 +29,9 @@ func HostInfo() (*HostInfoStat, error) {
}
hostname
,
err
:=
os
.
Hostname
()
if
err
!
=
nil
{
ret
urn
ret
,
err
if
err
=
=
nil
{
ret
.
Hostname
=
hostname
}
ret
.
Hostname
=
hostname
platform
,
family
,
version
,
err
:=
GetPlatformInformation
()
if
err
==
nil
{
...
...
@@ -51,10 +50,9 @@ func HostInfo() (*HostInfoStat, error) {
// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
v
:=
strings
.
Replace
(
values
[
2
],
","
,
""
,
1
)
t
,
err
:=
strconv
.
ParseUint
(
v
,
10
,
64
)
if
err
!
=
nil
{
ret
urn
ret
,
err
if
err
=
=
nil
{
ret
.
Uptime
=
t
}
ret
.
Uptime
=
t
}
return
ret
,
nil
...
...
host/host_linux.go
浏览文件 @
99d93f93
...
...
@@ -26,14 +26,13 @@ type LSB struct {
}
func
HostInfo
()
(
*
HostInfoStat
,
error
)
{
hostname
,
err
:=
os
.
Hostname
()
if
err
!=
nil
{
return
nil
,
err
ret
:=
&
HostInfoStat
{
OS
:
runtime
.
GOOS
,
}
ret
:=
&
HostInfoStat
{
Hostname
:
hostname
,
OS
:
runtime
.
GOOS
,
hostname
,
err
:=
os
.
Hostname
()
if
err
==
nil
{
ret
.
Hostname
=
hostname
}
platform
,
family
,
version
,
err
:=
GetPlatformInformation
()
...
...
host/host_windows.go
浏览文件 @
99d93f93
...
...
@@ -3,11 +3,11 @@
package
host
import
(
"os"
"fmt"
"
time
"
"
os
"
"runtime"
"strings"
"time"
"github.com/StackExchange/wmi"
...
...
@@ -17,26 +17,25 @@ import (
var
(
procGetSystemTimeAsFileTime
=
common
.
Modkernel32
.
NewProc
(
"GetSystemTimeAsFileTime"
)
osInfo
*
Win32_OperatingSystem
osInfo
*
Win32_OperatingSystem
)
type
Win32_OperatingSystem
struct
{
Version
string
Caption
string
ProductType
uint32
BuildNumber
string
Version
string
Caption
string
ProductType
uint32
BuildNumber
string
LastBootUpTime
time
.
Time
}
func
HostInfo
()
(
*
HostInfoStat
,
error
)
{
hostname
,
err
:=
os
.
Hostname
()
if
err
!=
nil
{
return
nil
,
err
ret
:=
&
HostInfoStat
{
OS
:
runtime
.
GOOS
,
}
ret
:=
&
HostInfoStat
{
Hostname
:
hostname
,
OS
:
runtime
.
GOOS
,
hostname
,
err
:=
os
.
Hostname
()
if
err
==
nil
{
ret
.
Hostname
=
hostname
}
platform
,
family
,
version
,
err
:=
GetPlatformInformation
()
...
...
@@ -44,15 +43,13 @@ func HostInfo() (*HostInfoStat, error) {
ret
.
Platform
=
platform
ret
.
PlatformFamily
=
family
ret
.
PlatformVersion
=
version
}
else
{
return
ret
,
err
}
ret
.
Uptime
,
err
=
BootTime
()
if
err
!=
nil
{
return
ret
,
err
}
procs
,
err
:=
process
.
Pids
()
if
err
!=
nil
{
return
ret
,
err
...
...
@@ -70,9 +67,9 @@ func GetOSInfo() (Win32_OperatingSystem, error) {
if
err
!=
nil
{
return
Win32_OperatingSystem
{},
err
}
osInfo
=
&
dst
[
0
]
return
dst
[
0
],
nil
}
...
...
@@ -98,7 +95,7 @@ func GetPlatformInformation() (platform string, family string, version string, e
// Platform
platform
=
strings
.
Trim
(
osInfo
.
Caption
,
" "
)
// PlatformFamily
switch
osInfo
.
ProductType
{
case
1
:
...
...
@@ -108,7 +105,7 @@ func GetPlatformInformation() (platform string, family string, version string, e
case
3
:
family
=
"Server"
}
// Platform Version
version
=
fmt
.
Sprintf
(
"%s Build %s"
,
osInfo
.
Version
,
osInfo
.
BuildNumber
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录