Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Dima Krasner
Sharkey
Commits
d50624f0
Unverified
Commit
d50624f0
authored
6 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
Better logs
parent
4f9b015d
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
src/remote/activitypub/resolver.ts
+9
-3
9 additions, 3 deletions
src/remote/activitypub/resolver.ts
src/services/drive/add-file.ts
+1
-1
1 addition, 1 deletion
src/services/drive/add-file.ts
with
10 additions
and
4 deletions
src/remote/activitypub/resolver.ts
+
9
−
3
View file @
d50624f0
...
...
@@ -49,7 +49,7 @@ export default class Resolver {
}
if
(
this
.
history
.
has
(
value
))
{
logger
.
error
(
`cannot resolve already resolved one`
);
logger
.
error
(
`cannot resolve already resolved one
:
${
value
}
`
);
throw
new
Error
(
'
cannot resolve already resolved one
'
);
}
...
...
@@ -65,7 +65,10 @@ export default class Resolver {
},
json
:
true
}).
catch
(
e
=>
{
logger
.
error
(
`request error:
${
e
.
message
}
`
);
logger
.
error
(
`request error:
${
value
}
:
${
e
.
message
}
`
,
{
url
:
value
,
e
:
e
});
throw
new
Error
(
`request error:
${
e
.
message
}
`
);
});
...
...
@@ -74,7 +77,10 @@ export default class Resolver {
!
object
[
'
@context
'
].
includes
(
'
https://www.w3.org/ns/activitystreams
'
)
:
object
[
'
@context
'
]
!==
'
https://www.w3.org/ns/activitystreams
'
))
{
logger
.
error
(
`invalid response:
${
value
}
`
);
logger
.
error
(
`invalid response:
${
value
}
`
,
{
url
:
value
,
object
:
object
});
throw
new
Error
(
'
invalid response
'
);
}
...
...
This diff is collapsed.
Click to expand it.
src/services/drive/add-file.ts
+
1
−
1
View file @
d50624f0
...
...
@@ -378,7 +378,7 @@ export default async function(
return
0
;
});
logger
.
info
(
`drive usage is
${
usage
}
`
);
logger
.
debug
(
`drive usage is
${
usage
}
`
);
const
instance
=
await
fetchMeta
();
const
driveCapacity
=
1024
*
1024
*
(
isLocalUser
(
user
)
?
instance
.
localDriveCapacityMb
:
instance
.
remoteDriveCapacityMb
);
...
...
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