Commit cb22457a authored by Holger Brand's avatar Holger Brand

Update CSPP_Core: Improve error handling; cofingure for usage with DIM and no DSC.

parent 31f9e1f1
......@@ -7,24 +7,24 @@ WebServer.TcpAccess="c+*.gsi.de"
# LibraryName:ClassName.AttributeName=""
[PV_Protocols]
ni.var.psp=DSCConnection
#ni.var.psp=DSCConnection
#ni.var.psp=SVConnection
#dstp=DSConnection
#dim=DIMConnection
#dim_c=DIMConnection
#dim_e=DIMConnection
#dim_p=DIMConnection
dim=DIMConnection
dim_c=DIMConnection
dim_e=DIMConnection
dim_p=DIMConnection
[PV_Monitors]
ni.var.psp_p=DSCMonitor
ni.var.psp_e=DSCMonitor
#ni.var.psp_p=DSCMonitor
#ni.var.psp_e=DSCMonitor
#ni.var.psp_p=SVMonitor
#ni.var.psp_e=SVMonitor
#dstp_p=DSMonitor
#dstp_e=DSMonitor
#dim_p=DIMMonitor
#dim_e=DIMMonitor
#dim_c=DIMCommandMonitor
#dim_cs=CS_CommandMonitor
dim_p=DIMMonitor
dim_e=DIMMonitor
dim_c=DIMCommandMonitor
dim_cs=CS_CommandMonitor
[DIMConnection]
LVClassPath="CSPP_DIM.lvlib:DIMConnection.lvclass"
CSPP_DIM:DIMConnection.ServerName="PCMON/eelpc007"
......@@ -123,7 +123,7 @@ CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="SystemMonitorProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_SystemMonitor:CSPP_SystemMonitor.Drives="C:\\,D:\\"
[SystemMonitor.URLs]
[SystemMonitorDSC.URLs]
PollingCounter="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_PollingInterval"
......@@ -139,7 +139,7 @@ Usage_0="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Usage_C"
Size_1="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Size_D"
Free_1="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Free_D"
Usage_1="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Usage_D"
[SystemMonitor.DIMURLs]
[SystemMonitor.URLs]
#PollingCounter="dim://localhost/PCMON/eelpc007/PollingCounter"
#PollingDeltaT="dim://localhost/PCMON/eelpc007/PollingDeltaT"
#PollingInterval="dim://localhost/PCMON/eelpc007/PollingInterval"
......@@ -162,9 +162,14 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="SystemMonitor"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[SystemMonitorProxy.URLs]
[SystemMonitorProxy.DSCURLs]
Activate="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitorProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitorProxy_WorkerActor?.1"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingInterval"
WorkerActor="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitorProxy_WorkerActor?.1"#Polling_Interval_Msg="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingInterval"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingStartStop"
[SystemMonitorProxy.DIMURLs]
#Activate="dim://localhost/CSPP-SystemMonitor/SystemMonitorProxy_Activate?.1"
#WorkerActor="dim://localhost/CSPP-SystemMonitor/SystemMonitorProxy_WorkerActor?.1"
#Polling_Interval_Msg="dim://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingInterval"
#Polling_Iterations_Msg="dim://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingIterations"
#Polling_Start_Stop_Msg="dim://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingStartStop"
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="19008000">
<Property Name="CCSymbols" Type="Str">CSPP_BuildContent,CSPP_Core;CSPP_WebpubLaunchBrowser,None;CSPP_DSC,True;CSPP_DIM,False;</Property>
<Property Name="CCSymbols" Type="Str">CSPP_BuildContent,CSPP_Core;CSPP_WebpubLaunchBrowser,None;CSPP_DSC,False;CSPP_DIM,True;</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Property Name="NI.Project.Description" Type="Str">This LabVIEW project is based on NI ActorFramework and CS++ libraries.
It is used to publish CPU, Memory and Disc usage to Shared Variable or DIM services.
......@@ -434,6 +434,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="Advapi32.dll" Type="Document" URL="Advapi32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="CSPP_NAInitialized Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_NAInitialized Msg/CSPP_NAInitialized Msg.lvlib"/>
<Item Name="kernel32.dll" Type="Document" URL="kernel32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
......@@ -469,33 +470,36 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="App_INI_itemID" Type="Ref">/My Computer/CSPP-SystemMonitor.ini</Property>
<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
<Property Name="App_useFFRTE" Type="Bool">true</Property>
<Property Name="App_winsec.certificate" Type="Str">Brand Holger (Brand)</Property>
<Property Name="App_winsec.description" Type="Str">http://timestamp.verisign.com</Property>
<Property Name="App_winsec.timestamp" Type="Str">http://timestamp.verisign.com/scripts/timstamp.dll</Property>
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{95E968AE-FBA3-4AF4-B59D-842A4FF56C3A}</Property>
<Property Name="Bld_buildSpecName" Type="Str">CSPP-SystemMonitor</Property>
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">/D/builds/CSPPDSC-SystemMonitor/App</Property>
<Property Name="Bld_localDestDir" Type="Path">/D/builds/CSPPDIM-SystemMonitor/App</Property>
<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Packages/Core/CSPP_Post-Build Action.vi</Property>
<Property Name="Bld_previewCacheID" Type="Str">{6211658F-9962-4EFC-81EE-AF45E75227E4}</Property>
<Property Name="Bld_supportedLanguage[0]" Type="Str">English</Property>
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/CSPP-Template/App/CSPP-Template_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">13</Property>
<Property Name="Bld_version.build" Type="Int">20</Property>
<Property Name="Destination[0].destName" Type="Str">CSPP-SystemMonitor.exe</Property>
<Property Name="Destination[0].path" Type="Path">/D/builds/CSPPDSC-SystemMonitor/App/NI_AB_PROJECTNAME.exe</Property>
<Property Name="Destination[0].path" Type="Path">/D/builds/CSPPDIM-SystemMonitor/App/NI_AB_PROJECTNAME.exe</Property>
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
<Property Name="Destination[0].type" Type="Str">App</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">/D/builds/CSPPDSC-SystemMonitor/App/data</Property>
<Property Name="Destination[1].path" Type="Path">/D/builds/CSPPDIM-SystemMonitor/App/data</Property>
<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Exe_cmdLineArgs" Type="Bool">true</Property>
<Property Name="Exe_iconItemID" Type="Ref">/My Computer/CSPP_SystemMonitor.ico</Property>
<Property Name="Exe_VardepHideDeployDlg" Type="Bool">true</Property>
<Property Name="Exe_VardepUndeployOnExit" Type="Bool">true</Property>
<Property Name="Source[0].itemID" Type="Str">{BB7D48DC-3080-4981-96D2-8B73A2BF759F}</Property>
<Property Name="Source[0].itemID" Type="Str">{34803862-125E-46B9-9567-B0CF7E020F57}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/README.md</Property>
......@@ -623,7 +627,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="DistPartCount" Type="Int">5</Property>
<Property Name="INST_author" Type="Str">GSI GmbH (DE)</Property>
<Property Name="INST_autoIncrement" Type="Bool">true</Property>
<Property Name="INST_buildLocation" Type="Path">/D/builds/CSPPDSC-SystemMonitor/Installer</Property>
<Property Name="INST_buildLocation" Type="Path">/D/builds/CSPPDIM-SystemMonitor/Installer</Property>
<Property Name="INST_buildSpecName" Type="Str">CSPP-SystemMonitor Installer</Property>
<Property Name="INST_defaultDir" Type="Str">{BB300358-5ED9-417E-A50B-9F27AB07DDFD}</Property>
<Property Name="INST_installerName" Type="Str">install.exe</Property>
......@@ -643,6 +647,9 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="MSI_upgradeCode" Type="Str">{19C42E4C-FBB1-4E46-8829-77953DD37C75}</Property>
<Property Name="MSI_windowMessage" Type="Str">This application will read and publish CPU, Memory and Disk usage to Shared Variables or DIM Services (default). Do not forget to set enviroment variable DIM_DNS_NODE where the dns.exe is executed.</Property>
<Property Name="MSI_windowTitle" Type="Str">CSPP SystemMonitor</Property>
<Property Name="MSI_winsec.certificate" Type="Str">Brand Holger (Brand)</Property>
<Property Name="MSI_winsec.description" Type="Str">http://timestamp.verisign.com</Property>
<Property Name="MSI_winsec.timestamp" Type="Str">http://timestamp.verisign.com/scripts/timstamp.dll</Property>
<Property Name="RegDest[0].dirName" Type="Str">Software</Property>
<Property Name="RegDest[0].dirTag" Type="Str">{DDFAFC8B-E728-4AC8-96DE-B920EBB97A86}</Property>
<Property Name="RegDest[0].parentTag" Type="Str">2</Property>
......
Subproject commit 33d9c2c62d686aae8e416f7c94126a49c4c6272a
Subproject commit 637efd932d2de160db489994a19f0074388ed2e8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment