Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
11a27b24
Unverified
Commit
11a27b24
authored
6 years ago
by
Daniel Kesselberg
Committed by
Morris Jobke
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Log exception
Signed-off-by:
Daniel Kesselberg
<
mail@danielkesselberg.de
>
parent
382495e2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/private/Repair.php
+1
-1
1 addition, 1 deletion
lib/private/Repair.php
lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
+9
-4
9 additions, 4 deletions
lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
with
10 additions
and
5 deletions
lib/private/Repair.php
+
1
−
1
View file @
11a27b24
...
@@ -149,7 +149,7 @@ class Repair implements IOutput {
...
@@ -149,7 +149,7 @@ class Repair implements IOutput {
new
AddCleanupUpdaterBackupsJob
(
\OC
::
$server
->
getJobList
()),
new
AddCleanupUpdaterBackupsJob
(
\OC
::
$server
->
getJobList
()),
new
RepairPendingCronJobs
(
\OC
::
$server
->
getDatabaseConnection
(),
\OC
::
$server
->
getConfig
()),
new
RepairPendingCronJobs
(
\OC
::
$server
->
getDatabaseConnection
(),
\OC
::
$server
->
getConfig
()),
new
SetVcardDatabaseUID
(
\OC
::
$server
->
getDatabaseConnection
(),
\OC
::
$server
->
getConfig
(),
\OC
::
$server
->
getLogger
()),
new
SetVcardDatabaseUID
(
\OC
::
$server
->
getDatabaseConnection
(),
\OC
::
$server
->
getConfig
(),
\OC
::
$server
->
getLogger
()),
new
CleanupCardDAVPhotoCache
(
\OC
::
$server
->
getConfig
(),
\OC
::
$server
->
getAppDataDir
(
'dav-photocache'
)),
new
CleanupCardDAVPhotoCache
(
\OC
::
$server
->
getConfig
(),
\OC
::
$server
->
getAppDataDir
(
'dav-photocache'
)
,
\OC
::
$server
->
getLogger
()
),
];
];
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
+
9
−
4
View file @
11a27b24
...
@@ -22,11 +22,11 @@ declare(strict_types=1);
...
@@ -22,11 +22,11 @@ declare(strict_types=1);
namespace
OC\Repair\NC16
;
namespace
OC\Repair\NC16
;
use
OC\Files\AppData\AppData
;
use
OCP\Files\IAppData
;
use
OCP\Files\IAppData
;
use
OCP\Files\NotFoundException
;
use
OCP\Files\NotFoundException
;
use
OCP\Files\SimpleFS\ISimpleFolder
;
use
OCP\Files\SimpleFS\ISimpleFolder
;
use
OCP\IConfig
;
use
OCP\IConfig
;
use
OCP\ILogger
;
use
OCP\Migration\IOutput
;
use
OCP\Migration\IOutput
;
use
OCP\Migration\IRepairStep
;
use
OCP\Migration\IRepairStep
;
...
@@ -44,12 +44,16 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
...
@@ -44,12 +44,16 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
/** @var IConfig */
/** @var IConfig */
private
$config
;
private
$config
;
/** @var AppData */
/** @var
I
AppData */
private
$appData
;
private
$appData
;
public
function
__construct
(
IConfig
$config
,
IAppData
$appData
)
{
/** @var ILogger */
private
$logger
;
public
function
__construct
(
IConfig
$config
,
IAppData
$appData
,
ILogger
$logger
)
{
$this
->
config
=
$config
;
$this
->
config
=
$config
;
$this
->
appData
=
$appData
;
$this
->
appData
=
$appData
;
$this
->
logger
=
$logger
;
}
}
public
function
getName
():
string
{
public
function
getName
():
string
{
...
@@ -78,7 +82,8 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
...
@@ -78,7 +82,8 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
/** @var ISimpleFolder $folder */
/** @var ISimpleFolder $folder */
$folder
->
getFile
(
'photo.'
)
->
delete
();
$folder
->
getFile
(
'photo.'
)
->
delete
();
}
catch
(
\Exception
$e
)
{
}
catch
(
\Exception
$e
)
{
$output
->
warning
(
'Could not delete "photo." file in dav-photocache/'
.
$folder
->
getName
());
$this
->
logger
->
logException
(
$e
);
$output
->
warning
(
'Could not delete file "dav-photocache/'
.
$folder
->
getName
()
.
'/photo."'
);
}
}
}
}
}
}
...
...
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