Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Cameo
cameo
Commits
34474216
Commit
34474216
authored
Oct 01, 2020
by
legoc
Browse files
(split) Removed retries attribute of an application
parent
47abfcdc
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/cameo/Application.cpp
View file @
34474216
...
...
@@ -1095,14 +1095,13 @@ bool Requester::isCanceled() const {
///////////////////////////////////////////////////////////////////////////
// Configuration
Configuration
::
Configuration
(
const
std
::
string
&
name
,
const
std
::
string
&
description
,
bool
singleInstance
,
bool
restart
,
int
startingTime
,
int
retries
,
int
stoppingTime
)
{
Configuration
::
Configuration
(
const
std
::
string
&
name
,
const
std
::
string
&
description
,
bool
singleInstance
,
bool
restart
,
int
startingTime
,
int
stoppingTime
)
{
m_name
=
name
;
m_description
=
description
;
m_singleInstance
=
singleInstance
;
m_restart
=
restart
;
m_startingTime
=
startingTime
;
m_retries
=
retries
;
m_stoppingTime
=
stoppingTime
;
}
...
...
@@ -1126,10 +1125,6 @@ int Configuration::getStartingTime() const {
return
m_startingTime
;
}
int
Configuration
::
getRetries
()
const
{
return
m_retries
;
}
int
Configuration
::
getStoppingTime
()
const
{
return
m_stoppingTime
;
}
...
...
@@ -1301,7 +1296,6 @@ std::ostream& operator<<(std::ostream& os, const application::Configuration& inf
<<
", single instance="
<<
info
.
m_singleInstance
<<
", restart="
<<
info
.
m_restart
<<
", starting time="
<<
info
.
m_startingTime
<<
", retries="
<<
info
.
m_retries
<<
", stopping time="
<<
info
.
m_stoppingTime
<<
"]"
;
return
os
;
...
...
src/cameo/Application.h
View file @
34474216
...
...
@@ -476,14 +476,13 @@ class Configuration {
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
,
const
Configuration
&
);
public:
Configuration
(
const
std
::
string
&
name
,
const
std
::
string
&
description
,
bool
singleInfo
,
bool
restart
,
int
startingTime
,
int
retries
,
int
stoppingTime
);
Configuration
(
const
std
::
string
&
name
,
const
std
::
string
&
description
,
bool
singleInfo
,
bool
restart
,
int
startingTime
,
int
stoppingTime
);
const
std
::
string
&
getName
()
const
;
const
std
::
string
&
getDescription
()
const
;
bool
hasSingleInstance
()
const
;
bool
canRestart
()
const
;
int
getStartingTime
()
const
;
int
getRetries
()
const
;
int
getStoppingTime
()
const
;
private:
...
...
@@ -492,7 +491,6 @@ private:
bool
m_singleInstance
;
bool
m_restart
;
int
m_startingTime
;
int
m_retries
;
int
m_stoppingTime
;
};
...
...
src/cameo/Server.cpp
View file @
34474216
...
...
@@ -314,7 +314,6 @@ std::vector<application::Configuration> Server::getApplicationConfigurations() c
bool
runsSingle
=
config
[
message
::
ApplicationConfig
::
RUNS_SINGLE
].
GetBool
();
bool
restart
=
config
[
message
::
ApplicationConfig
::
RESTART
].
GetBool
();
int
startingTime
=
config
[
message
::
ApplicationConfig
::
STARTING_TIME
].
GetInt
();
int
retries
=
config
[
message
::
ApplicationConfig
::
RETRIES
].
GetInt
();
int
stoppingTime
=
config
[
message
::
ApplicationConfig
::
STOPPING_TIME
].
GetInt
();
application
::
Configuration
applicationConfig
(
name
,
...
...
@@ -322,7 +321,6 @@ std::vector<application::Configuration> Server::getApplicationConfigurations() c
runsSingle
,
restart
,
startingTime
,
retries
,
stoppingTime
);
configs
.
push_back
(
applicationConfig
);
...
...
src/cameo/message/Message.h
View file @
34474216
...
...
@@ -79,7 +79,6 @@ namespace message {
constexpr
const
char
*
RUNS_SINGLE
=
"runsSingle"
;
// required bool runsSingle = 3;
constexpr
const
char
*
RESTART
=
"restart"
;
// required bool restart = 4;
constexpr
const
char
*
STARTING_TIME
=
"startingTime"
;
// required int32 startingTime = 5;
constexpr
const
char
*
RETRIES
=
"retries"
;
// required int32 retries = 6;
constexpr
const
char
*
STOPPING_TIME
=
"stoppingTime"
;
// required int32 stoppingTime = 7;
}
...
...
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