Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
5d553ff4
Commit
5d553ff4
authored
2 years ago
by
Lasse Tjernaes Wardenaer
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "Clean up messages printed in the terminal for cta-readtp"
parent
1d91f061
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ReleaseNotes.md
+1
-0
1 addition, 0 deletions
ReleaseNotes.md
tapeserver/readtp/ReadtpCmdMain.cpp
+9
-10
9 additions, 10 deletions
tapeserver/readtp/ReadtpCmdMain.cpp
with
10 additions
and
10 deletions
ReleaseNotes.md
+
1
−
0
View file @
5d553ff4
...
...
@@ -8,6 +8,7 @@
-
cta/CTA#224 - Improve error message for cta-verify-file whn VID does not exist
-
cta/CTA#230 - Modify CTA code to enforce VID uppercase
-
cta/CTA#239 - Add improvments to the cta-change-storage-class tool
-
cta/CTA#248 - Clean up output from cta-readtp
### Bug Fixes
-
cta/CTA#234 - Replace stoi with toUint64 in standalone cli tool
-
cta/CTA#238 - Compilation fails when using cta::common::Configuration::getConfEntInt(...)
...
...
This diff is collapsed.
Click to expand it.
tapeserver/readtp/ReadtpCmdMain.cpp
+
9
−
10
View file @
5d553ff4
...
...
@@ -17,6 +17,7 @@
#include
<iostream>
#include
"common/exception/Exception.hpp"
#include
"tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.hpp"
#include
"tapeserver/daemon/TapedConfiguration.hpp"
#include
"tapeserver/readtp/ReadtpCmd.hpp"
...
...
@@ -46,16 +47,14 @@ int main(const int argc, char *const *const argv) {
try
{
// Config file needed to find the cta-get-encryption-key script
const
cta
::
tape
::
daemon
::
TapedConfiguration
tapedConfig
=
cta
::
tape
::
daemon
::
TapedConfiguration
::
createFromCtaConf
(
DAEMON_CONFIG
,
l
og
);
cta
::
tape
::
daemon
::
TapedConfiguration
::
createFromCtaConf
(
DAEMON_CONFIG
,
dummyL
og
);
externalEncryptionKeyScript
=
tapedConfig
.
externalEncryptionKeyScript
.
value
();
useEncryption
=
tapedConfig
.
useEncryption
.
value
()
==
"yes"
?
true
:
false
;
}
catch
(...)
{
cta
::
exception
::
Exception
ex
;
ex
.
getMessage
()
<<
"ReadtpCmd: Error while trying to read TapedConfiguration config file: "
<<
DAEMON_CONFIG
;
throw
ex
;
}
useEncryption
=
tapedConfig
.
useEncryption
.
value
()
==
"yes"
;
cta
::
tapeserver
::
readtp
::
ReadtpCmd
cmd
(
std
::
cin
,
std
::
cout
,
std
::
cerr
,
log
,
dummyLog
,
mc
,
useEncryption
,
externalEncryptionKeyScript
);
return
cmd
.
main
(
argc
,
argv
);
cta
::
tapeserver
::
readtp
::
ReadtpCmd
cmd
(
std
::
cin
,
std
::
cout
,
std
::
cerr
,
log
,
dummyLog
,
mc
,
useEncryption
,
externalEncryptionKeyScript
);
return
cmd
.
main
(
argc
,
argv
);
}
catch
(
cta
::
exception
::
Exception
&
ex
)
{
std
::
cerr
<<
ex
.
getMessageValue
()
<<
std
::
endl
;
return
1
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment