Skip to content

Commit 41da654

Browse files
committed
Update: improve logs during upload of posts & pages
1 parent cfd1a6e commit 41da654

File tree

1 file changed

+7
-23
lines changed

1 file changed

+7
-23
lines changed

WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadStarter.kt

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import kotlinx.coroutines.sync.withLock
1616
import org.wordpress.android.analytics.AnalyticsTracker.Stat
1717
import org.wordpress.android.fluxc.Dispatcher
1818
import org.wordpress.android.fluxc.generated.UploadActionBuilder
19+
import org.wordpress.android.fluxc.model.PostModel
1920
import org.wordpress.android.fluxc.model.SiteModel
2021
import org.wordpress.android.fluxc.store.PageStore
2122
import org.wordpress.android.fluxc.store.PostStore
@@ -139,41 +140,24 @@ class UploadStarter @Inject constructor(
139140
val action = uploadActionUseCase.getAutoUploadAction(post, site)
140141
Pair(post, action)
141142
}
142-
.filter { (_, action) ->
143-
action != DO_NOTHING
144-
}
143+
.filter { (_, action) -> action != DO_NOTHING }
145144
.toList()
146145
.forEach { (post, action) ->
147146
runCatching {
148147
trackAutoUploadAction(action, post.status, post.isPage)
149-
AppLog.d(
150-
T.POSTS,
151-
"UploadStarter for post " +
152-
"(isPage: ${post.isPage.compareTo(false)}) " +
153-
"title: ${post.title}, " +
154-
"action: $action"
155-
)
156-
dispatcher.dispatch(
157-
UploadActionBuilder.newIncrementNumberOfAutoUploadAttemptsAction(
158-
post
159-
)
160-
)
161-
uploadServiceFacade.uploadPost(
162-
context = appContext,
163-
post = post,
164-
trackAnalytics = false
165-
)
148+
AppLog.d(T.POSTS, "UploadStarter for ${post.toStringLog()}; action: $action")
149+
dispatcher.dispatch(UploadActionBuilder.newIncrementNumberOfAutoUploadAttemptsAction(post))
150+
uploadServiceFacade.uploadPost(appContext, post, trackAnalytics = false)
166151
}.onFailure {
167152
AppLog.e(T.POSTS, it)
168153
throwable = it
169154
}
170155
}
171-
throwable?.let {
172-
throw it
173-
}
174156
}
175157
}
176158

159+
private fun PostModel.toStringLog() = "${if (isPage) "page" else "post"} with title: $title"
160+
177161
private fun trackAutoUploadAction(
178162
action: UploadAction,
179163
status: String,

0 commit comments

Comments
 (0)