mirror of
https://github.com/gnustep/libs-ec.git
synced 2025-02-22 03:11:16 +00:00
fix to report delete/compress settings properly
This commit is contained in:
parent
d48a192b08
commit
bbc7f86228
1 changed files with 62 additions and 34 deletions
96
EcCommand.m
96
EcCommand.m
|
@ -556,8 +556,10 @@ desiredName(Desired state)
|
||||||
NSTimeInterval debUndeleted;
|
NSTimeInterval debUndeleted;
|
||||||
NSTimeInterval logUncompressed;
|
NSTimeInterval logUncompressed;
|
||||||
NSTimeInterval logUndeleted;
|
NSTimeInterval logUndeleted;
|
||||||
NSInteger compressAfter;
|
NSInteger debCompressAfter;
|
||||||
NSInteger deleteAfter;
|
NSInteger debDeleteAfter;
|
||||||
|
NSInteger logCompressAfter;
|
||||||
|
NSInteger logDeleteAfter;
|
||||||
BOOL sweeping;
|
BOOL sweeping;
|
||||||
}
|
}
|
||||||
- (void) alarmCode: (AlarmCode)ac
|
- (void) alarmCode: (AlarmCode)ac
|
||||||
|
@ -3398,6 +3400,53 @@ NSLog(@"Problem %@", localException);
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void) cmdDefaultsChanged: (NSNotification*)n
|
||||||
|
{
|
||||||
|
[self cmdUpdated];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString*) cmdUpdated
|
||||||
|
{
|
||||||
|
NSUserDefaults *defs = [self cmdDefaults];
|
||||||
|
NSInteger i;
|
||||||
|
|
||||||
|
i = [defs integerForKey: @"CompressDebugAfter"];
|
||||||
|
if (i < 1)
|
||||||
|
{
|
||||||
|
i = 7;
|
||||||
|
}
|
||||||
|
debCompressAfter = i;
|
||||||
|
i = [defs integerForKey: @"DeleteDebugAfter"];
|
||||||
|
if (i < 1)
|
||||||
|
{
|
||||||
|
i = 90;
|
||||||
|
}
|
||||||
|
debDeleteAfter = i;
|
||||||
|
if (debDeleteAfter < debCompressAfter)
|
||||||
|
{
|
||||||
|
debDeleteAfter = debCompressAfter;
|
||||||
|
}
|
||||||
|
|
||||||
|
i = [defs integerForKey: @"CompressLogsAfter"];
|
||||||
|
if (i < 1)
|
||||||
|
{
|
||||||
|
i = 7;
|
||||||
|
}
|
||||||
|
logCompressAfter = i;
|
||||||
|
i = [defs integerForKey: @"DeleteLogsAfter"];
|
||||||
|
if (i < 1)
|
||||||
|
{
|
||||||
|
i = 180;
|
||||||
|
}
|
||||||
|
logDeleteAfter = i;
|
||||||
|
if (logDeleteAfter < logCompressAfter)
|
||||||
|
{
|
||||||
|
logDeleteAfter = logCompressAfter;
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
|
|
||||||
- (void) disableLaunching
|
- (void) disableLaunching
|
||||||
{
|
{
|
||||||
launchEnabled = NO;
|
launchEnabled = NO;
|
||||||
|
@ -5261,8 +5310,10 @@ NSLog(@"Problem %@", localException);
|
||||||
[m appendString: @" Launching is currently suspended.\n"];
|
[m appendString: @" Launching is currently suspended.\n"];
|
||||||
}
|
}
|
||||||
[m appendFormat: @" %@\n", [LaunchInfo description]];
|
[m appendFormat: @" %@\n", [LaunchInfo description]];
|
||||||
[m appendFormat: @" Compress/Delete after %d/%d days.\n",
|
[m appendFormat: @" Debug Compress/Delete after %d/%d days.\n",
|
||||||
(int)compressAfter, (int)deleteAfter];
|
(int)debCompressAfter, (int)debDeleteAfter];
|
||||||
|
[m appendFormat: @" Log Compress/Delete after %d/%d days.\n",
|
||||||
|
(int)logCompressAfter, (int)logDeleteAfter];
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5774,11 +5825,7 @@ NSLog(@"Problem %@", localException);
|
||||||
* would start compressing but no further ... we don't want to delete
|
* would start compressing but no further ... we don't want to delete
|
||||||
* all debug!
|
* all debug!
|
||||||
*/
|
*/
|
||||||
purgeAfter = [[self cmdDefaults] integerForKey: @"CompressDebugAfter"];
|
purgeAfter = debCompressAfter;
|
||||||
if (purgeAfter < 1)
|
|
||||||
{
|
|
||||||
purgeAfter = 7;
|
|
||||||
}
|
|
||||||
|
|
||||||
mgr = [NSFileManager defaultManager];
|
mgr = [NSFileManager defaultManager];
|
||||||
|
|
||||||
|
@ -5815,6 +5862,8 @@ NSLog(@"Problem %@", localException);
|
||||||
NSTimeInterval latestDeleteAt;
|
NSTimeInterval latestDeleteAt;
|
||||||
NSTimeInterval now;
|
NSTimeInterval now;
|
||||||
NSTimeInterval ti;
|
NSTimeInterval ti;
|
||||||
|
NSInteger deleteAfter;
|
||||||
|
NSInteger compressAfter;
|
||||||
NSFileManager *mgr;
|
NSFileManager *mgr;
|
||||||
NSString *dir;
|
NSString *dir;
|
||||||
NSString *file;
|
NSString *file;
|
||||||
|
@ -5827,34 +5876,13 @@ NSLog(@"Problem %@", localException);
|
||||||
*/
|
*/
|
||||||
if (deb)
|
if (deb)
|
||||||
{
|
{
|
||||||
compressAfter = [[self cmdDefaults] integerForKey: @"CompressDebugAfter"];
|
compressAfter = debCompressAfter;
|
||||||
if (compressAfter < 1)
|
deleteAfter = debDeleteAfter;
|
||||||
{
|
|
||||||
compressAfter = 7;
|
|
||||||
}
|
|
||||||
deleteAfter = [[self cmdDefaults] integerForKey: @"DeleteDebugAfter"];
|
|
||||||
if (deleteAfter < 1)
|
|
||||||
{
|
|
||||||
deleteAfter = 90;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
compressAfter = [[self cmdDefaults] integerForKey: @"CompressLogsAfter"];
|
compressAfter = logCompressAfter;
|
||||||
if (compressAfter < 1)
|
deleteAfter = logDeleteAfter;
|
||||||
{
|
|
||||||
compressAfter = 7;
|
|
||||||
}
|
|
||||||
deleteAfter = [[self cmdDefaults] integerForKey: @"DeleteLogsAfter"];
|
|
||||||
if (deleteAfter < 1)
|
|
||||||
{
|
|
||||||
deleteAfter = 180;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (deleteAfter < compressAfter)
|
|
||||||
{
|
|
||||||
deleteAfter = compressAfter;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mgr = [[NSFileManager new] autorelease];
|
mgr = [[NSFileManager new] autorelease];
|
||||||
|
|
Loading…
Reference in a new issue