Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
3f333082
Commit
3f333082
authored
May 31, 2012
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(DBServer): ввёл LastNumberOfTimer
parent
f45cbee7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
14 deletions
+6
-14
test.xml
conf/test.xml
+4
-13
DBServer_MySQL.h
extensions/DBServer-MySQL/DBServer_MySQL.h
+1
-0
start_fg.sh
extensions/DBServer-MySQL/start_fg.sh
+1
-1
No files found.
conf/test.xml
View file @
3f333082
...
...
@@ -73,16 +73,7 @@
<UDPExchange2
name=
"UDPExchange2"
/>
<UNetExchange
name=
"UNetExchange"
/>
<HeartBeatTime
time_msec=
"5000"
/>
<<<<<<
< HEAD
<TestGen
name=
"TestGen"
input1_s=
"Input1_S"
input2_s=
"DumpSensor1_S"
output1_c=
"DO_C"
/>
=======
<TestGen
input1_s=
"Input1_S"
input2_s=
"DumpSensor1_S"
name=
"TestGen"
output1_c=
"DO_C"
/>
>>>>>>> (unet2): исправил ошибку в конфигурировании датчика связи
</settings>
<ObjectsMap
idfromfile=
"0"
>
<!--
...
...
@@ -167,10 +158,10 @@
</controllers>
<!-- ******************* Идентификаторы сервисов ***************** -->
<services
name=
"Services"
>
<item
name=
"InfoServer"
/>
<item
name=
"DBServer
"
/>
<item
name=
"PrintServer"
/>
<item
name=
"TimeService"
/>
<item
id=
"5010"
name=
"InfoServer"
/>
<item
id=
"5011"
name=
"DBServer1
"
/>
<item
id=
"5012"
name=
"PrintServer"
/>
<item
id=
"5013"
name=
"TimeService"
/>
</services>
<!-- ******************* Идентификаторы объектов ***************** -->
<objects
name=
"UniObjects"
>
...
...
extensions/DBServer-MySQL/DBServer_MySQL.h
View file @
3f333082
...
...
@@ -170,6 +170,7 @@ class DBServer_MySQL:
{
PingTimer
,
/*!< таймер на переодическую проверку соединения с сервером БД */
ReconnectTimer
/*!< таймер на повторную попытку соединения с сервером БД (или восстановления связи) */
lastNumberOfTimer
};
...
...
extensions/DBServer-MySQL/start_fg.sh
View file @
3f333082
...
...
@@ -2,4 +2,4 @@
ulimit
-Sc
1000000
uniset-start.sh
-f
./uniset-mysql-dbserver
--confile
test.xml
--name
DBServer
--unideb-add-levels
info,crit,warn,level9,system
uniset-start.sh
-f
./uniset-mysql-dbserver
--confile
test.xml
--name
DBServer
1
--unideb-add-levels
info,crit,warn,level9,system
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment