File tree Expand file tree Collapse file tree 5 files changed +29
-7
lines changed Expand file tree Collapse file tree 5 files changed +29
-7
lines changed Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ async fn main() -> anyhow::Result<()> {
5858 CONFIG . validate_staging ( ) ?;
5959 migration:: run_metadata_migration ( & CONFIG ) . await ?;
6060 let metadata = storage:: resolve_parseable_metadata ( ) . await ?;
61+
6162 banner:: print ( & CONFIG , & metadata) . await ;
6263 rbac:: map:: init ( & metadata) ;
6364 metadata. set_global ( ) ;
Original file line number Diff line number Diff line change @@ -35,8 +35,10 @@ use crate::{
3535pub async fn run_metadata_migration ( config : & Config ) -> anyhow:: Result < ( ) > {
3636 let object_store = config. storage ( ) . get_object_store ( ) ;
3737 let storage_metadata = get_storage_metadata ( & * object_store) . await ?;
38+ println ! ( "storage_metadata in run_metadata_migration: {:?}" , storage_metadata) ;
3839 let staging_metadata = get_staging_metadata ( config) ?;
39-
40+ println ! ( "staging_metadata in run_metadata_migration: {:?}" , staging_metadata) ;
41+
4042 fn get_version ( metadata : & serde_json:: Value ) -> Option < & str > {
4143 metadata
4244 . as_object ( )
Original file line number Diff line number Diff line change @@ -43,15 +43,22 @@ pub struct Config {
4343impl Config {
4444 fn new ( ) -> Self {
4545 let cli = parseable_cli_command ( ) . get_matches ( ) ;
46-
4746 match cli. subcommand ( ) {
4847 Some ( ( "local-store" , m) ) => {
4948 let server = match Server :: from_arg_matches ( m) {
50- Ok ( server) => server,
49+
50+ Ok ( server) => {
51+ println ! ( "server: {:?}" , server) ;
52+ server
53+ } ,
5154 Err ( err) => err. exit ( ) ,
5255 } ;
5356 let storage = match FSConfig :: from_arg_matches ( m) {
54- Ok ( server) => server,
57+
58+ Ok ( storage) => {
59+ println ! ( "storage: {:?}" , storage) ;
60+ storage
61+ } ,
5562 Err ( err) => err. exit ( ) ,
5663 } ;
5764
@@ -81,11 +88,17 @@ impl Config {
8188 }
8289 Some ( ( "s3-store" , m) ) => {
8390 let server = match Server :: from_arg_matches ( m) {
84- Ok ( server) => server,
91+ Ok ( server) => {
92+ println ! ( "server: {:?}" , server) ;
93+ server
94+ } ,
8595 Err ( err) => err. exit ( ) ,
8696 } ;
8797 let storage = match S3Config :: from_arg_matches ( m) {
88- Ok ( server) => server,
98+ Ok ( storage) => {
99+ println ! ( "storage: {:?}" , storage) ;
100+ storage
101+ } ,
89102 Err ( err) => err. exit ( ) ,
90103 } ;
91104
Original file line number Diff line number Diff line change @@ -120,6 +120,7 @@ impl ObjectStorage for LocalFS {
120120 let path = self . path_in_root ( path) ;
121121 if let Some ( parent) = path. parent ( ) {
122122 fs:: create_dir_all ( parent) . await ?;
123+ println ! ( "created dir {:?}" , parent) ;
123124 }
124125 let res = fs:: write ( path, resource) . await ;
125126
@@ -140,6 +141,7 @@ impl ObjectStorage for LocalFS {
140141
141142 async fn check ( & self ) -> Result < ( ) , ObjectStorageError > {
142143 fs:: create_dir_all ( & self . root ) . await ?;
144+ println ! ( "created dir self.root {:?}" , & self . root) ;
143145 validate_path_is_writeable ( & self . root )
144146 . map_err ( |e| ObjectStorageError :: UnhandledError ( e. into ( ) ) )
145147 }
@@ -187,7 +189,9 @@ impl ObjectStorage for LocalFS {
187189 } ;
188190 let to_path = self . root . join ( key) ;
189191 if let Some ( path) = to_path. parent ( ) {
192+ println ! ( "created dir path {:?}" , & path) ;
190193 fs:: create_dir_all ( path) . await ?
194+
191195 }
192196 let _ = fs_extra:: file:: copy ( path, to_path, & op) ?;
193197 Ok ( ( ) )
Original file line number Diff line number Diff line change @@ -96,9 +96,11 @@ impl StorageMetadata {
9696// overwrites staging metadata while updating storage info
9797pub async fn resolve_parseable_metadata ( ) -> Result < StorageMetadata , ObjectStorageError > {
9898 let staging_metadata = get_staging_metadata ( ) ?;
99+ println ! ( "staging metadata in resolve_parseable_metadata: {:?}" , staging_metadata) ;
99100 let storage = CONFIG . storage ( ) . get_object_store ( ) ;
100101 let remote_metadata = storage. get_metadata ( ) . await ?;
101-
102+ println ! ( "remote metadata in resolve_parseable_metadata: {:?}" , remote_metadata) ;
103+
102104 let check = match ( staging_metadata, remote_metadata) {
103105 ( Some ( staging) , Some ( remote) ) => {
104106 if staging. deployment_id == remote. deployment_id {
You can’t perform that action at this time.
0 commit comments