typeable/bloodhound
1
0
Fork 0
mirror of https://github.com/typeable/bloodhound.git synced 2024-08-16 11:50:34 +03:00
Code Issues Projects Releases Wiki Activity

Don't attempt to validate VM version numbers

Browse Source
This commit is contained in:
Chris Allen 2018-05-06 11:58:08 -05:00
parent 4b8dcea66a
commit ebf7206ae5
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Database/V5/Bloodhound/Internal/Client.hs
View File

@ -1418,7 +1418,7 @@ data NodeJVMInfo = NodeJVMInfo {
, nodeJVMInfoMemoryInfo :: JVMMemoryInfo
, nodeJVMInfoStartTime :: UTCTime
, nodeJVMInfoVMVendor :: Text
, nodeJVMVMVersion :: VersionNumber
, nodeJVMVMVersion :: VMVersion
-- ^ JVM doesn't seme to follow normal version conventions
, nodeJVMVMName :: Text
, nodeJVMVersion :: VersionNumber
@ -1436,6 +1436,18 @@ data JVMMemoryInfo = JVMMemoryInfo {
, jvmMemoryInfoHeapInit :: Bytes
} deriving (Eq, Show)
-- VM version numbers don't appear to be SemVer
-- so we're special casing this jawn.
newtype VMVersion =
VMVersion { unVMVersion :: Text }
deriving (Eq, Show)
instance ToJSON VMVersion where
toJSON = toJSON . unVMVersion
instance FromJSON VMVersion where
parseJSON = withText "VMVersion" (pure . VMVersion)
newtype JVMMemoryPool = JVMMemoryPool {
jvmMemoryPool :: Text
} deriving (Eq, Show, FromJSON)