Commit cb92288382be39f37b026b9e687669d54d5e1048
1 parent
891a3e20
Exists in
master
-Agente comunicando com o gerente de 1 em 1 minuto para verificar se há coleta f…
…orçada, se sim executa a coleta, idependente do que estiver no gercols.inf. -Modificada versão do chksis.
Showing
11 changed files
with
91 additions
and
17 deletions
Show diff stats
cacic280.dproj
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | <Borland.Personality>Delphi.Personality</Borland.Personality> | 40 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 41 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> | 41 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 42 | <BorlandProject> | 42 | <BorlandProject> |
| 43 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | 43 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">6</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.6</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> |
| 44 | </ProjectExtensions> | 44 | </ProjectExtensions> |
| 45 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> | 45 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 46 | <ItemGroup> | 46 | <ItemGroup> |
cacic280.res
No preview for this file type
cacicservice/cacicservice.dproj
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | <Borland.Personality>Delphi.Personality</Borland.Personality> | 37 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 38 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> | 38 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 39 | <BorlandProject> | 39 | <BorlandProject> |
| 40 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">E:\NTService\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Sustentação do Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacicservice.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | 40 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">E:\NTService\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">6</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Sustentação do Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.6</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacicservice.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> |
| 41 | </ProjectExtensions> | 41 | </ProjectExtensions> |
| 42 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> | 42 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 43 | <ItemGroup> | 43 | <ItemGroup> |
cacicservice/cacicservice.res
No preview for this file type
chksis/chksis.dproj
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | <Borland.Personality>Delphi.Personality</Borland.Personality> | 29 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 30 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> | 30 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 31 | <BorlandProject> | 31 | <BorlandProject> |
| 32 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\Arquivos de programas\Borland\Delphi7\Mitec\D7</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Arquivos de programas\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">4</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Verificador de Integridade</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.4</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">ChkSIS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">chksis.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | 32 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\Arquivos de programas\Borland\Delphi7\Mitec\D7</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Arquivos de programas\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Verificador de Integridade</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">ChkSIS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">chksis.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> |
| 33 | </ProjectExtensions> | 33 | </ProjectExtensions> |
| 34 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> | 34 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 35 | <ItemGroup> | 35 | <ItemGroup> |
chksis/chksis.res
No preview for this file type
gercols/gercols.dpr
| @@ -245,9 +245,6 @@ Begin | @@ -245,9 +245,6 @@ Begin | ||
| 245 | objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName); | 245 | objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName); |
| 246 | if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then | 246 | if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then |
| 247 | Begin | 247 | Begin |
| 248 | - objCacic.setValueToFile('Configs','forca_coleta', | ||
| 249 | - objCacic.getValueFromTags('forca_coleta', strRetorno), | ||
| 250 | - strGerColsInfFileName); | ||
| 251 | objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName); | 248 | objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName); |
| 252 | objCacic.setValueToFile('Configs','WebServicesFolderName',objCacic.getValueFromTags('WebServicesFolderName', strRetorno,'<>'), strChkSisInfFileName); | 249 | objCacic.setValueToFile('Configs','WebServicesFolderName',objCacic.getValueFromTags('WebServicesFolderName', strRetorno,'<>'), strChkSisInfFileName); |
| 253 | objCacic.setWebManagerAddress(objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>')); | 250 | objCacic.setWebManagerAddress(objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>')); |
| @@ -369,6 +366,53 @@ Begin | @@ -369,6 +366,53 @@ Begin | ||
| 369 | End; | 366 | End; |
| 370 | end; | 367 | end; |
| 371 | 368 | ||
| 369 | +procedure getTest(); | ||
| 370 | +var strRetorno : string; | ||
| 371 | +Begin | ||
| 372 | + Try | ||
| 373 | + // Verifico comunicação com o Módulo Gerente WEB. | ||
| 374 | + // Tratamentos de valores para tráfego POST: | ||
| 375 | + objCacic.setValueToFile('Configs','ConexaoOK','N', strGerColsInfFileName); | ||
| 376 | + | ||
| 377 | + strAcaoGerCols := 'Preparando teste de comunicação com Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'; | ||
| 378 | + | ||
| 379 | + objCacic.writeDebugLog('getTest: Teste de Comunicação.'); | ||
| 380 | + | ||
| 381 | + Try | ||
| 382 | + strRetorno := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/test', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, 'Testando comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'); | ||
| 383 | + | ||
| 384 | + if (strRetorno <> '0') Then | ||
| 385 | + Begin | ||
| 386 | + objCacic.setBoolCipher(not objCacic.isInDebugMode); | ||
| 387 | + objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName); | ||
| 388 | + if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then | ||
| 389 | + Begin | ||
| 390 | + objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName); | ||
| 391 | + objCacic.setValueToFile('Configs','WebServicesFolderName',objCacic.getValueFromTags('WebServicesFolderName', strRetorno,'<>'), strChkSisInfFileName); | ||
| 392 | + objCacic.setWebManagerAddress(objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>')); | ||
| 393 | + objCacic.setWebServicesFolderName(objCacic.getValueFromTags('WebServicesFolderName', strRetorno,'<>')); | ||
| 394 | + End; | ||
| 395 | + | ||
| 396 | + strAcaoGerCols := 'IP validado pelo Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'; | ||
| 397 | + objCacic.writeDebugLog('getTest: ' + strAcaoGerCols); | ||
| 398 | + End; | ||
| 399 | + except | ||
| 400 | + on E : Exception do | ||
| 401 | + Begin | ||
| 402 | + objCacic.writeDebugLog('getTest: Lançando Exceção #2'); | ||
| 403 | + objCacic.writeExceptionLog(E.Message,E.ClassName,'Exceção #2 - Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'); | ||
| 404 | + objCacic.writeDailyLog('Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'); | ||
| 405 | + End; | ||
| 406 | + End; | ||
| 407 | + Except | ||
| 408 | + on E : Exception do | ||
| 409 | + Begin | ||
| 410 | + objCacic.writeDebugLog('getTest: Lançando Exceção #5'); | ||
| 411 | + objCacic.writeExceptionLog(E.Message,E.ClassName,'getTest: Exceção #5'); | ||
| 412 | + End; | ||
| 413 | + End; | ||
| 414 | +end; | ||
| 415 | + | ||
| 372 | procedure criaCookie(strFileName : String); | 416 | procedure criaCookie(strFileName : String); |
| 373 | var textFileAguarde : TextFile; | 417 | var textFileAguarde : TextFile; |
| 374 | Begin | 418 | Begin |
| @@ -783,10 +827,15 @@ Begin | @@ -783,10 +827,15 @@ Begin | ||
| 783 | 827 | ||
| 784 | // Primeira chamada efetuada pelo Agente Principal para posterior ação de coletas | 828 | // Primeira chamada efetuada pelo Agente Principal para posterior ação de coletas |
| 785 | If FindCmdLineSwitch('getConfigs', True) Then | 829 | If FindCmdLineSwitch('getConfigs', True) Then |
| 786 | - Begin | 830 | + Begin |
| 787 | getConfigs(true); | 831 | getConfigs(true); |
| 788 | Finalizar(false); | 832 | Finalizar(false); |
| 789 | - End; | 833 | + End |
| 834 | + //Chamada realizada de minuto em minuto para verificar se há coleta a ser forçada. | ||
| 835 | + else if FindCmdLineSwitch ('getTest', True) then | ||
| 836 | + begin | ||
| 837 | + getTest(); | ||
| 838 | + end; | ||
| 790 | 839 | ||
| 791 | // Chamada efetuada pelo Agente Principal quando da existência de temp\<AgentePrincipal>.exe para AutoUpdate | 840 | // Chamada efetuada pelo Agente Principal quando da existência de temp\<AgentePrincipal>.exe para AutoUpdate |
| 792 | If FindCmdLineSwitch('UpdatePrincipal', True) Then | 841 | If FindCmdLineSwitch('UpdatePrincipal', True) Then |
| @@ -1583,7 +1632,7 @@ Begin | @@ -1583,7 +1632,7 @@ Begin | ||
| 1583 | // Se for uma coleta forçada, também grava as informações. | 1632 | // Se for uma coleta forçada, também grava as informações. |
| 1584 | If (objCacic.enCrypt(strColetaAtual) <> strColetaAnterior) or | 1633 | If (objCacic.enCrypt(strColetaAtual) <> strColetaAnterior) or |
| 1585 | (strColetaAnterior = '') or | 1634 | (strColetaAnterior = '') or |
| 1586 | - (objCacic.getValueFromFile('Configs', 'forca_coleta') = 's') Then | 1635 | + (objCacic.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') Then |
| 1587 | Begin | 1636 | Begin |
| 1588 | strAcaoGercols := 'Enviando coleta de informações sobre ' + objCacic.getValueFromTags('te_descricao_breve',strActionDefinition) + ' para o Gerente WEB ('+objCacic.getWebManagerAddress+').'; | 1637 | strAcaoGercols := 'Enviando coleta de informações sobre ' + objCacic.getValueFromTags('te_descricao_breve',strActionDefinition) + ' para o Gerente WEB ('+objCacic.getWebManagerAddress+').'; |
| 1589 | objCacic.writeDailyLog(strAcaoGercols); | 1638 | objCacic.writeDailyLog(strAcaoGercols); |
| @@ -1685,7 +1734,14 @@ begin | @@ -1685,7 +1734,14 @@ begin | ||
| 1685 | CriaCookie('aguarde_GER.txt'); | 1734 | CriaCookie('aguarde_GER.txt'); |
| 1686 | 1735 | ||
| 1687 | // Esse teste também colocará a estação de trabalho em DEBUG, caso seja determinado no Gerente WEB | 1736 | // Esse teste também colocará a estação de trabalho em DEBUG, caso seja determinado no Gerente WEB |
| 1688 | - Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/test', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, strAcaoGerCols); | 1737 | + if FindCmdLineSwitch ('getTest', True) then |
| 1738 | + begin | ||
| 1739 | + getTest(); | ||
| 1740 | + Finalizar(true); | ||
| 1741 | + Sair; | ||
| 1742 | + end | ||
| 1743 | + else | ||
| 1744 | + Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/test', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, strAcaoGerCols); | ||
| 1689 | 1745 | ||
| 1690 | objCacic.setBoolCipher(not objCacic.isInDebugMode); | 1746 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| 1691 | 1747 |
gercols/gercols.dproj
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | <Borland.Personality>Delphi.Personality</Borland.Personality> | 38 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 39 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> | 39 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 40 | <BorlandProject> | 40 | <BorlandProject> |
| 41 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | 41 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">6</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.6</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> |
| 42 | </ProjectExtensions> | 42 | </ProjectExtensions> |
| 43 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> | 43 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 44 | <ItemGroup> | 44 | <ItemGroup> |
gercols/gercols.res
No preview for this file type
main.dfm
| @@ -1770,4 +1770,10 @@ object FormularioGeral: TFormularioGeral | @@ -1770,4 +1770,10 @@ object FormularioGeral: TFormularioGeral | ||
| 1770 | Left = 8 | 1770 | Left = 8 |
| 1771 | Top = 568 | 1771 | Top = 568 |
| 1772 | end | 1772 | end |
| 1773 | + object CheckForcaColeta: TTimer | ||
| 1774 | + Interval = 60000 | ||
| 1775 | + OnTimer = CheckForcaColetaTimer | ||
| 1776 | + Left = 392 | ||
| 1777 | + Top = 568 | ||
| 1778 | + end | ||
| 1773 | end | 1779 | end |
main.pas
| @@ -176,6 +176,7 @@ type | @@ -176,6 +176,7 @@ type | ||
| 176 | ApplicationEvents1: TApplicationEvents; | 176 | ApplicationEvents1: TApplicationEvents; |
| 177 | Panel1: TPanel; | 177 | Panel1: TPanel; |
| 178 | ExecutarMapa1: TMenuItem; | 178 | ExecutarMapa1: TMenuItem; |
| 179 | + CheckForcaColeta: TTimer; | ||
| 179 | procedure RemoveIconesMortos; | 180 | procedure RemoveIconesMortos; |
| 180 | procedure ChecaCONFIGS; | 181 | procedure ChecaCONFIGS; |
| 181 | procedure CriaFormSenha(Sender: TObject); | 182 | procedure CriaFormSenha(Sender: TObject); |
| @@ -261,6 +262,7 @@ type | @@ -261,6 +262,7 @@ type | ||
| 261 | procedure InvocaMapa1Click(Sender: TObject); | 262 | procedure InvocaMapa1Click(Sender: TObject); |
| 262 | procedure ExecutarMapa1DrawItem(Sender: TObject; ACanvas: TCanvas; | 263 | procedure ExecutarMapa1DrawItem(Sender: TObject; ACanvas: TCanvas; |
| 263 | ARect: TRect; Selected: Boolean); | 264 | ARect: TRect; Selected: Boolean); |
| 265 | + procedure CheckForcaColetaTimer(Sender: TObject); | ||
| 264 | private | 266 | private |
| 265 | FUsb : TUsbClass; | 267 | FUsb : TUsbClass; |
| 266 | ShutdownEmExecucao : Boolean; | 268 | ShutdownEmExecucao : Boolean; |
| @@ -1204,12 +1206,15 @@ begin | @@ -1204,12 +1206,15 @@ begin | ||
| 1204 | 1206 | ||
| 1205 | objCACIC.writeDebugLog('Invoca_GerCols: Invocando Gerente de Coletas com ação: "'+p_acao+'"'); | 1207 | objCACIC.writeDebugLog('Invoca_GerCols: Invocando Gerente de Coletas com ação: "'+p_acao+'"'); |
| 1206 | 1208 | ||
| 1207 | - if boolShowInfo then | 1209 | + if boolShowInfo and not (p_acao = 'getTest') then |
| 1208 | objCACIC.writeDailyLog('Invocando Gerente de Coletas com ação: "'+p_acao+'"'); | 1210 | objCACIC.writeDailyLog('Invocando Gerente de Coletas com ação: "'+p_acao+'"'); |
| 1209 | 1211 | ||
| 1210 | timerNuExecApos.Enabled := False; | 1212 | timerNuExecApos.Enabled := False; |
| 1211 | objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"'); | 1213 | objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"'); |
| 1212 | - objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,false,SW_HIDE); | 1214 | + if (p_acao = 'getTest') then //se for getTest, esperar a aplicação finalizar. |
| 1215 | + objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,true,SW_HIDE) | ||
| 1216 | + else | ||
| 1217 | + objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,false,SW_HIDE); | ||
| 1213 | g_intStatus := 1; | 1218 | g_intStatus := 1; |
| 1214 | objCacic.setBoolCipher(not objCacic.isInDebugMode); | 1219 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| 1215 | End | 1220 | End |
| @@ -1283,7 +1288,7 @@ begin | @@ -1283,7 +1288,7 @@ begin | ||
| 1283 | FindCmdLineSwitch('atualizacao', True) or | 1288 | FindCmdLineSwitch('atualizacao', True) or |
| 1284 | Pode_Coletar or | 1289 | Pode_Coletar or |
| 1285 | (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') or | 1290 | (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') or |
| 1286 | - (trim(objCACIC.getValueFromFile('Configs','ForcaColeta', strGerColsInfFileName))='S') Then | 1291 | + (trim(objCACIC.getValueFromFile('Configs','forca_coleta', strGerColsInfFileName))='S') Then |
| 1287 | Begin | 1292 | Begin |
| 1288 | //////////////////////////////////////////////////////////////////////////////// | 1293 | //////////////////////////////////////////////////////////////////////////////// |
| 1289 | // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // | 1294 | // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // |
| @@ -1319,8 +1324,7 @@ begin | @@ -1319,8 +1324,7 @@ begin | ||
| 1319 | 1324 | ||
| 1320 | objCACIC.writeDebugLog('ExecutaCACIC: Primeira chamada ao Gerente de Coletas...'); | 1325 | objCACIC.writeDebugLog('ExecutaCACIC: Primeira chamada ao Gerente de Coletas...'); |
| 1321 | Invoca_GerCols('getConfigs'); | 1326 | Invoca_GerCols('getConfigs'); |
| 1322 | - if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGercolsInfFileName) = 's') then | ||
| 1323 | - Invoca_GerCols('collect'); | 1327 | + |
| 1324 | sleep(3000); // Pausa para início do Gerente de Coletas e criação do arquivo temp\aguarde_GER.txt | 1328 | sleep(3000); // Pausa para início do Gerente de Coletas e criação do arquivo temp\aguarde_GER.txt |
| 1325 | 1329 | ||
| 1326 | Application.ProcessMessages; | 1330 | Application.ProcessMessages; |
| @@ -1330,7 +1334,8 @@ begin | @@ -1330,7 +1334,8 @@ begin | ||
| 1330 | // Serão 4 tentativas por minuto | 1334 | // Serão 4 tentativas por minuto |
| 1331 | // Serão 30 minutos no máximo de tentativas, totalizando 120 | 1335 | // Serão 30 minutos no máximo de tentativas, totalizando 120 |
| 1332 | intTentativas := 0; | 1336 | intTentativas := 0; |
| 1333 | - while not Pode_Coletar and (intTentativas < 121) do | 1337 | + while (not Pode_Coletar and (intTentativas < 121)) and |
| 1338 | + (objCACIC.getValueFromFile('Configs', 'forca_coleta',strGercolsInfFileName) <> 'S') do | ||
| 1334 | Begin | 1339 | Begin |
| 1335 | objCACIC.writeDebugLog('ExecutaCACIC: Aguardando 15 segundos...'); | 1340 | objCACIC.writeDebugLog('ExecutaCACIC: Aguardando 15 segundos...'); |
| 1336 | Application.ProcessMessages; | 1341 | Application.ProcessMessages; |
| @@ -2217,6 +2222,13 @@ begin | @@ -2217,6 +2222,13 @@ begin | ||
| 2217 | End; | 2222 | End; |
| 2218 | end; | 2223 | end; |
| 2219 | 2224 | ||
| 2225 | +procedure TFormularioGeral.CheckForcaColetaTimer(Sender: TObject); | ||
| 2226 | +begin | ||
| 2227 | + Invoca_GerCols('getTest'); | ||
| 2228 | + if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') then | ||
| 2229 | + Invoca_GerCols('collect'); | ||
| 2230 | +end; | ||
| 2231 | + | ||
| 2220 | procedure TFormularioGeral.CheckIfDownloadedVersion; | 2232 | procedure TFormularioGeral.CheckIfDownloadedVersion; |
| 2221 | Begin | 2233 | Begin |
| 2222 | objCACIC.writeDebugLog('CheckIfDownloadedVersion: Verificando existência de nova versão baixada do Agente Principal...'); | 2234 | objCACIC.writeDebugLog('CheckIfDownloadedVersion: Verificando existência de nova versão baixada do Agente Principal...'); |