summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-02-16 00:40:08 +0000
committerBernard Normier <bernard@zeroc.com>2005-02-16 00:40:08 +0000
commitf6b39aa2667834a2dee6a162c56ea3278d77d5a7 (patch)
tree3b30978d3c80004121592825991fa971bbe098b5 /cpp
parent*** empty log message *** (diff)
downloadice-f6b39aa2667834a2dee6a162c56ea3278d77d5a7.tar.bz2
ice-f6b39aa2667834a2dee6a162c56ea3278d77d5a7.tar.xz
ice-f6b39aa2667834a2dee6a162c56ea3278d77d5a7.zip
Fixed DbCheckpoint property
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/PropertyNames.def2
-rwxr-xr-xcpp/demo/Freeze/backup/backup4
-rwxr-xr-xcpp/demo/Freeze/backup/recover6
-rw-r--r--cpp/src/Ice/PropertyNames.cpp4
-rw-r--r--cpp/src/Ice/PropertyNames.h2
5 files changed, 14 insertions, 4 deletions
diff --git a/cpp/config/PropertyNames.def b/cpp/config/PropertyNames.def
index 1991a6ddd89..064670b404e 100644
--- a/cpp/config/PropertyNames.def
+++ b/cpp/config/PropertyNames.def
@@ -408,7 +408,7 @@ Glacier2:
Trace.Session
Freeze:
- DbEnv.<any>.DbCheckpointPeriod
+ DbEnv.<any>.CheckpointPeriod
DbEnv.<any>.DbHome
DbEnv.<any>.DbPrivate
DbEnv.<any>.DbRecoverFatal
diff --git a/cpp/demo/Freeze/backup/backup b/cpp/demo/Freeze/backup/backup
index 7f0fdb4404c..3f759db7f21 100755
--- a/cpp/demo/Freeze/backup/backup
+++ b/cpp/demo/Freeze/backup/backup
@@ -12,6 +12,10 @@ case $1 in
db_checkpoint -1 -h db
echo "====== Retrieve list of old logs ======"
oldLogs=`db_archive -h db`
+ if [ ! -d $1 ]
+ then
+ mkdir $1
+ fi
if [ $1 = "full" ]
then
echo "====== Data backup ======"
diff --git a/cpp/demo/Freeze/backup/recover b/cpp/demo/Freeze/backup/recover
index 602b21e4845..43f12ac6205 100755
--- a/cpp/demo/Freeze/backup/recover
+++ b/cpp/demo/Freeze/backup/recover
@@ -2,6 +2,12 @@
case $1 in
"full" | "incremental") echo "Performing $1 recovery"
+
+ if [ ! -d $1 ]
+ then
+ mkdir $1
+ fi
+
echo "====== Save current logs ======"
if [ ! -d db/logs/save ] ; then mkdir db/logs/save; fi
\cp db/logs/log.* db/logs/save
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index f42794ca910..26e0e2a3899 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Feb 15 19:04:59 2005
+// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Feb 15 19:33:16 2005
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -348,7 +348,7 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
const char* IceInternal::PropertyNames::FreezeProps[] =
{
- "Freeze.DbEnv.*.DbCheckpointPeriod",
+ "Freeze.DbEnv.*.CheckpointPeriod",
"Freeze.DbEnv.*.DbHome",
"Freeze.DbEnv.*.DbPrivate",
"Freeze.DbEnv.*.DbRecoverFatal",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 8b2a4249c0c..2010f35fde0 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Feb 15 19:04:59 2005
+// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Feb 15 19:33:16 2005
// IMPORTANT: Do not edit this file -- any edits made here will be lost!