git.iko.soy/typeable/bloodhound
on master help sign in
Don't attempt to validate VM version numbers
commitebf7206ae56194647e3d43b36a3518bceea95015 authorChris Allen <cma@bitemyapp.com> dateSun 6 May 2018, 11:58 (8 years ago) parent4b8dcea
1 file changed+13−1
src/Database/V5/Bloodhound/Internal/Client.hs+13−1
src/Database/V5/Bloodhound/Internal/Client.hs+13−1
@@ -1418,7 +1418,7 @@ data NodeJVMInfo = NodeJVMInfo {
14181418 , nodeJVMInfoMemoryInfo :: JVMMemoryInfo
14191419 , nodeJVMInfoStartTime :: UTCTime
14201420 , nodeJVMInfoVMVendor :: Text
1421− , nodeJVMVMVersion :: VersionNumber
1421+ , nodeJVMVMVersion :: VMVersion
14221422 -- ^ JVM doesn't seme to follow normal version conventions
14231423 , nodeJVMVMName :: Text
14241424 , nodeJVMVersion :: VersionNumber
@@ -1436,6 +1436,18 @@ data JVMMemoryInfo = JVMMemoryInfo {
14361436 , jvmMemoryInfoHeapInit :: Bytes
14371437 } deriving (Eq, Show)
14381438
1439+-- VM version numbers don't appear to be SemVer
1440+-- so we're special casing this jawn.
1441+newtype VMVersion =
1442+ VMVersion { unVMVersion :: Text }
1443+ deriving (Eq, Show)
1444+
1445+instance ToJSON VMVersion where
1446+ toJSON = toJSON . unVMVersion
1447+
1448+instance FromJSON VMVersion where
1449+ parseJSON = withText "VMVersion" (pure . VMVersion)
1450+
14391451newtype JVMMemoryPool = JVMMemoryPool {
14401452 jvmMemoryPool :: Text
14411453 } deriving (Eq, Show, FromJSON)