File tree Expand file tree Collapse file tree 5 files changed +10
-9
lines changed
Expand file tree Collapse file tree 5 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -52,13 +52,13 @@ protected override Task<int> Run()
5252 {
5353 verb = "clear" ;
5454 KeyValueSettings . Clear ( config , _key ) ;
55- SeqCliConfig . Write ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
55+ SeqCliConfig . WriteToFile ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
5656 }
5757 else if ( _value != null )
5858 {
5959 verb = "update" ;
6060 KeyValueSettings . Set ( config , _key , _value ) ;
61- SeqCliConfig . Write ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
61+ SeqCliConfig . WriteToFile ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
6262 }
6363 else
6464 {
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ int RunSync()
5050 {
5151 var config = SeqCliConfig . ReadFromFile ( RuntimeConfigurationLoader . DefaultConfigFilename ) ;
5252 config . Profiles [ _name ] = new SeqCliConnectionConfig { ServerUrl = _url , ApiKey = _apiKey } ;
53- SeqCliConfig . Write ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
53+ SeqCliConfig . WriteToFile ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
5454 return 0 ;
5555 }
5656 catch ( Exception ex )
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ int RunSync()
4141 return 1 ;
4242 }
4343
44- SeqCliConfig . Write ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
44+ SeqCliConfig . WriteToFile ( config , RuntimeConfigurationLoader . DefaultConfigFilename ) ;
4545
4646 return 0 ;
4747 }
Original file line number Diff line number Diff line change @@ -16,9 +16,7 @@ static class RuntimeConfigurationLoader
1616 /// </summary>
1717 public static SeqCliConfig Load ( )
1818 {
19- var config = File . Exists ( DefaultConfigFilename ) ?
20- SeqCliConfig . ReadFromFile ( DefaultConfigFilename ) :
21- new SeqCliConfig ( ) ;
19+ var config = SeqCliConfig . ReadFromFile ( DefaultConfigFilename ) ;
2220
2321 EnvironmentOverrides . Apply ( DefaultEnvironmentVariablePrefix , config ) ;
2422
Original file line number Diff line number Diff line change @@ -40,15 +40,18 @@ class SeqCliConfig
4040 /// This method is typically used when editing/manipulating the configuration file itself. To read and use the
4141 /// configuration at runtime, see <see cref="RuntimeConfigurationLoader.Load"/>.
4242 /// </summary>
43+ /// <remarks>If <paramref name="filename"/> does not exist, a new default configuration will be returned.</remarks>
4344 public static SeqCliConfig ReadFromFile ( string filename )
4445 {
46+ if ( ! File . Exists ( filename ) )
47+ return new SeqCliConfig ( ) ;
48+
4549 var content = File . ReadAllText ( filename ) ;
4650 return JsonConvert . DeserializeObject < SeqCliConfig > ( content , SerializerSettings ) ! ;
4751 }
4852
49- public static void Write ( SeqCliConfig data , string filename )
53+ public static void WriteToFile ( SeqCliConfig data , string filename )
5054 {
51- if ( data == null ) throw new ArgumentNullException ( nameof ( data ) ) ;
5255 if ( ! data . _exportable )
5356 throw new InvalidOperationException ( "The provided configuration is not exportable." ) ;
5457
You can’t perform that action at this time.
0 commit comments