diff options
author | cjihrig <cjihrig@gmail.com> | 2019-01-28 00:14:40 -0500 |
---|---|---|
committer | cjihrig <cjihrig@gmail.com> | 2019-01-30 16:39:44 -0500 |
commit | c2335465c3b208f714436da87e1068d572519cab (patch) | |
tree | 712e8c5b705e5d272b810a1ab15e02aa51b44274 /src/node_report.cc | |
parent | 5aa89d616f8b30e5ea73bd9f0f12bf13ef184e5a (diff) | |
download | android-node-v8-c2335465c3b208f714436da87e1068d572519cab.tar.gz android-node-v8-c2335465c3b208f714436da87e1068d572519cab.tar.bz2 android-node-v8-c2335465c3b208f714436da87e1068d572519cab.zip |
report: split up osVersion and machine values
Prior to this commit, on non-Windows platforms, the "osVersion"
value was prepended to the "machine" value.
PR-URL: https://github.com/nodejs/node/pull/25755
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'src/node_report.cc')
-rw-r--r-- | src/node_report.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/node_report.cc b/src/node_report.cc index 4caa01d3cf..69ae0ee53e 100644 --- a/src/node_report.cc +++ b/src/node_report.cc @@ -426,22 +426,20 @@ static void PrintVersionInformation(JSONWriter* writer) { if (uname(&os_info) >= 0) { #ifdef _AIX buf << os_info.sysname << " " << os_info.version << "." << os_info.release; - writer->json_keyvalue("osVersion", buf.str()); - buf.flush(); #else buf << os_info.sysname << " " << os_info.release << " " << os_info.version; +#endif /* _AIX */ writer->json_keyvalue("osVersion", buf.str()); - buf.flush(); -#endif + buf.str(""); + buf << os_info.nodename << " " << os_info.machine; + writer->json_keyvalue("machine", buf.str()); + const char* (*libc_version)(); *(reinterpret_cast<void**>(&libc_version)) = dlsym(RTLD_DEFAULT, "gnu_get_libc_version"); if (libc_version != nullptr) { writer->json_keyvalue("glibc", (*libc_version)()); } - buf << os_info.nodename << " " << os_info.machine; - writer->json_keyvalue("machine", buf.str()); - buf.flush(); } #endif } |